[GNUnet-SVN] [gnunet] branch master updated (800cb255e -> dca5b11d1)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lurchi pushed a change to branch master
in repository gnunet.

    from 800cb255e Fixed potential NULL dereference.
     new dbebf1ac6 Revert "fix dereferencing uninitialized pointer"
     new dca5b11d1 fix dereferencing uninitialized rs/ws; assert non-NULL 
before dereferencing network/file handles

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/util/scheduler.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 2912dd78b..9d37231e7 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -757,6 +757,7 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
     if (1 == read_nh_len)
     {
       GNUNET_assert (NULL != read_nh);
+      GNUNET_assert (NULL != *read_nh);
       fdi->fd = *read_nh;
       fdi->et = GNUNET_SCHEDULER_ET_IN;
       fdi->sock = GNUNET_NETWORK_get_fd (*read_nh);
@@ -766,6 +767,7 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
     else if (1 == write_nh_len)
     {
       GNUNET_assert (NULL != write_nh);
+      GNUNET_assert (NULL != *write_nh);
       fdi->fd = *write_nh;
       fdi->et = GNUNET_SCHEDULER_ET_OUT;
       fdi->sock = GNUNET_NETWORK_get_fd (*write_nh);
@@ -775,6 +777,7 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
     else if (1 == read_fh_len)
     {
       GNUNET_assert (NULL != read_fh);
+      GNUNET_assert (NULL != *read_fh);
       fdi->fh = *read_fh;
       fdi->et = GNUNET_SCHEDULER_ET_IN;
       fdi->sock = (*read_fh)->fd; // FIXME: does not work under WIN32
@@ -784,6 +787,7 @@ init_fd_info (struct GNUNET_SCHEDULER_Task *t,
     else
     {
       GNUNET_assert (NULL != write_fh);
+      GNUNET_assert (NULL != *write_fh);
       fdi->fh = *write_fh;
       fdi->et = GNUNET_SCHEDULER_ET_OUT;
       fdi->sock = (*write_fh)->fd; // FIXME: does not work under WIN32

-- 
To stop receiving notification emails like this one, please contact
address@hidden