samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r14230 - in trunk/source/smbd: .

Subject: svn commit: samba r14230 - in trunk/source/smbd: .
From:
Date: Sun, 12 Mar 2006 04:19:02 +0000 GMT
Author: jra
Date: 2006-03-12 04:19:01 +0000 (Sun, 12 Mar 2006)
New Revision: 14230

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14230

Log:
Something Coverity hasn't caught (yet) but I've gotten
sensitive to null derefs. get_timed_events_timeout()
can potentially return NULL. Cope with this.
Jeremy.

Modified:
   trunk/source/smbd/process.c


Changeset:
Modified: trunk/source/smbd/process.c
===================================================================
--- trunk/source/smbd/process.c 2006-03-12 04:18:43 UTC (rev 14229)
+++ trunk/source/smbd/process.c 2006-03-12 04:19:01 UTC (rev 14230)
@@ -445,9 +445,11 @@
                struct timeval tmp;
                struct timeval *tp = 
get_timed_events_timeout(&tmp,SMBD_SELECT_TIMEOUT);
 
-               to = timeval_min(&to, tp);
-               if (timeval_is_zero(&to)) {
-                       return True;
+               if (tp) {
+                       to = timeval_min(&to, tp);
+                       if (timeval_is_zero(&to)) {
+                               return True;
+                       }
                }
        }
        

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r14230 - in trunk/source/smbd: ., jra <=