diff options
| author | Andreas Schneider <asn@samba.org> | 2018-11-27 08:23:25 +0100 |
|---|---|---|
| committer | Gary Lockyer <gary@samba.org> | 2018-12-04 00:23:02 +0100 |
| commit | 2b2edccb5a90f23db0bd733551ac645d6ac4e44f (patch) | |
| tree | f5ba3a9a5b664c203a2fd51c3818ae4636a5e689 | |
| parent | 86592673fbd3399b35832ca138681b06cb007b2c (diff) | |
| download | samba-2b2edccb5a90f23db0bd733551ac645d6ac4e44f.tar.gz | |
s3:lib: Fix undefined behavior in tdb_unpack()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Tue Dec 4 00:23:03 CET 2018 on sn-devel-144
| -rw-r--r-- | source3/lib/util_tdb.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 8a5d831225e..0d1532193d4 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -191,9 +191,11 @@ int tdb_unpack(const uint8_t *buf, int in_bufsize, const char *fmt, ...) len = strnlen((const char *)buf, bufsize) + 1; if (bufsize < len) goto no_space; - *ps = SMB_STRDUP((const char *)buf); - if (*ps == NULL) { - goto no_space; + if (ps != NULL) { + *ps = SMB_STRDUP((const char *)buf); + if (*ps == NULL) { + goto no_space; + } } break; case 'f': /* null-terminated string */ @@ -201,7 +203,9 @@ int tdb_unpack(const uint8_t *buf, int in_bufsize, const char *fmt, ...) len = strnlen((const char *)buf, bufsize) + 1; if (bufsize < len || len > sizeof(fstring)) goto no_space; - memcpy(s, buf, len); + if (s != NULL) { + memcpy(s, buf, len); + } break; case 'B': /* fixed-length string */ i = va_arg(ap, uint32_t *); @@ -220,10 +224,12 @@ int tdb_unpack(const uint8_t *buf, int in_bufsize, const char *fmt, ...) } if (bufsize < len) goto no_space; - *b = (char *)SMB_MALLOC(*i); - if (! *b) - goto no_space; - memcpy(*b, buf+4, *i); + if (b != NULL) { + *b = (char *)SMB_MALLOC(*i); + if (! *b) + goto no_space; + memcpy(*b, buf+4, *i); + } break; default: DEBUG(0,("Unknown tdb_unpack format %c in %s\n", |