Module Name: src Committed By: stacktic Date: Sun Oct 31 19:45:53 UTC 2010
Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c netpgp.c Log Message: PR/42435 : Check pointers against NULL to avoid dereferencing them To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c cvs rdiff -u -r1.77 -r1.78 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.46 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.47 --- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.46 Wed Sep 1 17:25:57 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Sun Oct 31 19:45:53 2010 @@ -57,7 +57,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: keyring.c,v 1.46 2010/09/01 17:25:57 agc Exp $"); +__RCSID("$NetBSD: keyring.c,v 1.47 2010/10/31 19:45:53 stacktic Exp $"); #endif #ifdef HAVE_FCNTL_H @@ -902,7 +902,7 @@ uint8_t keyid[OPS_KEY_ID_SIZE + 1]; size_t len; - if (!keyring) { + if (!keyring || !name || !from) { return NULL; } len = strlen(name); Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.77 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.78 --- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.77 Tue Oct 19 00:00:00 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Sun Oct 31 19:45:53 2010 @@ -34,7 +34,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: netpgp.c,v 1.77 2010/10/19 00:00:00 agc Exp $"); +__RCSID("$NetBSD: netpgp.c,v 1.78 2010/10/31 19:45:53 stacktic Exp $"); #endif #include <sys/types.h> @@ -423,6 +423,8 @@ if (userid == NULL) { userid = netpgp_getvar(netpgp, "userid"); + if (userid == NULL) + return NULL; } else if (userid[0] == '0' && userid[1] == 'x') { userid += 2; }