rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Handle cases in add_timeout() where the function is called with a NULL

Browse Source 
value for the 'when' parameter (#506626)
This commit is contained in:
David Cantrell 2009-06-27 00:09:13 +00:00
parent 51c3df57cf
commit 70d67fc19e
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dhcp-4.1.0-add_timeout_when_NULL.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up dhcp-4.1.0/common/dispatch.c.dracut dhcp-4.1.0/common/dispatch.c
--- dhcp-4.1.0/common/dispatch.c.dracut 2008-01-23 16:43:04.000000000 -1000
+++ dhcp-4.1.0/common/dispatch.c 2009-06-25 16:21:03.000000000 -1000
@@ -104,6 +104,10 @@ void add_timeout (when, where, what, ref
{
struct timeout *t, *q;
+ if (when == NULL) {
+ return;
+ }
+
/* See if this timeout supersedes an existing timeout. */
t = (struct timeout *)0;
for (q = timeouts; q; q = q -> next) {

3
dhcp.spec
View File

@ -186,7 +186,7 @@ libdhcpctl and libomapi static libraries are also included in this package.
%patch17 -p1 %patch17 -p1
# If the ipv6 kernel module is missing, do not segfault # If the ipv6 kernel module is missing, do not segfault
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19367] # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19367])
%patch18 -p1 %patch18 -p1
# Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524) # Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524)
@ -194,6 +194,7 @@ libdhcpctl and libomapi static libraries are also included in this package.
# Handle cases in add_timeout() where the function is called with a NULL # Handle cases in add_timeout() where the function is called with a NULL
# value for the 'when' parameter # value for the 'when' parameter
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #19867])
%patch20 -p1 %patch20 -p1
# Copy in documentation and example scripts for LDAP patch to dhcpd # Copy in documentation and example scripts for LDAP patch to dhcpd