Mercurial > hg > dhcpcd

changeset 2166:e3224a33d655 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a crash where we don't care about option length.
author Roy Marples <roy@marples.name>
date Wed, 27 Nov 2013 21:14:43 +0000
parents f65d8c155be4
children 1a0a80db36d6
files dhcp-common.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp-common.c	Wed Nov 27 21:14:19 2013 +0000
+++ b/dhcp-common.c	Wed Nov 27 21:14:43 2013 +0000
@@ -116,7 +116,8 @@
 	if (!p || pl < sizeof(d))
 		return -1;
 	memcpy(&d, p, sizeof(d));
-	*i = ntohl(d);
+	if (i)
+		*i = ntohl(d);
 	return 0;
 }
 
@@ -128,7 +129,8 @@
 	if (!p || pl < sizeof(d))
 		return -1;
 	memcpy(&d, p, sizeof(d));
-	*i = ntohs(d);
+	if (i)
+		*i = ntohs(d);
 	return 0;
 }
 
@@ -138,7 +140,8 @@
 
 	if (!p)
 		return -1;
-	*i = *(p);
+	if (i)
+		*i = *(p);
 	return 0;
 }