Module Name: src Committed By: jakllsch Date: Sat Jan 9 03:33:54 UTC 2016
Modified Files: src/sys/dev/usb: hid.c Log Message: avoid potential NULL deref in failure case To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/hid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/hid.c diff -u src/sys/dev/usb/hid.c:1.40 src/sys/dev/usb/hid.c:1.41 --- src/sys/dev/usb/hid.c:1.40 Thu Jan 7 16:10:49 2016 +++ src/sys/dev/usb/hid.c Sat Jan 9 03:33:53 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: hid.c,v 1.40 2016/01/07 16:10:49 jakllsch Exp $ */ +/* $NetBSD: hid.c,v 1.41 2016/01/09 03:33:53 jakllsch Exp $ */ /* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.40 2016/01/07 16:10:49 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.41 2016/01/09 03:33:53 jakllsch Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -425,7 +425,8 @@ hid_locate(const void *desc, int size, u } } hid_end_parse(d); - loc->size = 0; + if (loc != NULL) + loc->size = 0; return (0); }