|
From: <as...@us...> - 2009-01-29 20:54:31
|
Update of /cvsroot/aolserver/aolserver/nsd In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31198 Modified Files: driver.c Log Message: Avoid dereferencing NULL conn ptr in the driver query logic. Index: driver.c =================================================================== RCS file: /cvsroot/aolserver/aolserver/nsd/driver.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** driver.c 19 Oct 2007 09:46:38 -0000 1.57 --- driver.c 29 Jan 2009 20:54:24 -0000 1.58 *************** *** 1329,1333 **** sockPtr->acceptTime.sec, sockPtr->acceptTime.usec, sockPtr->timeout.sec, sockPtr->timeout.usec); ! NsAppendConn(drvPtr->queryPtr, sockPtr->connPtr, "i/o"); Tcl_DStringEndSublist(drvPtr->queryPtr); sockPtr = sockPtr->nextPtr; --- 1329,1338 ---- sockPtr->acceptTime.sec, sockPtr->acceptTime.usec, sockPtr->timeout.sec, sockPtr->timeout.usec); ! if (sockPtr->connPtr != NULL) { ! NsAppendConn(drvPtr->queryPtr, sockPtr->connPtr, "i/o"); ! } else { ! Tcl_DStringStartSublist(drvPtr->queryPtr); ! Tcl_DStringEndSublist(drvPtr->queryPtr); ! } Tcl_DStringEndSublist(drvPtr->queryPtr); sockPtr = sockPtr->nextPtr; |