summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-08-28 01:48:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:54 -0500
commitfb0ed72caaf7cce0421008f1cddab1dbd4362214 (patch)
tree76471de97447b9ff2462917b56586c14b18e840f
parent16c8f09a1f48af0ad2ddd6e5ea59abd50a792a0e (diff)
downloadsamba-fb0ed72caaf7cce0421008f1cddab1dbd4362214.tar.gz
samba-fb0ed72caaf7cce0421008f1cddab1dbd4362214.tar.bz2
samba-fb0ed72caaf7cce0421008f1cddab1dbd4362214.zip
r17862: Fix possible NULL deref (like rev 17861) found by the
Stanford group. Jeremy. (This used to be commit cfd39c2804df3f67637adf223542daa208c893c7)
-rw-r--r--source3/lib/util_str.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 6677d075bd..2b647b0641 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -2284,7 +2284,9 @@ SMB_BIG_UINT STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr)
const char *p = nptr;
if (!p) {
- *entptr = p;
+ if (entptr) {
+ *entptr = p;
+ }
return val;
}