summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-08 10:24:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:26 -0500
commitf40f35fa0acc7264c2c1cad6a32cfb85fb8923d2 (patch)
tree148e61cef295128b1b532f087c497844359ee43d /source4
parent436732e1ed8a8b6be81e4190f7259b2d577a7e00 (diff)
downloadsamba-f40f35fa0acc7264c2c1cad6a32cfb85fb8923d2.tar.gz
samba-f40f35fa0acc7264c2c1cad6a32cfb85fb8923d2.tar.bz2
samba-f40f35fa0acc7264c2c1cad6a32cfb85fb8923d2.zip
r4098: catch null guid string so RPC-DRSUAPI works against my server
(This used to be commit c4c83f04f55d206716380330d2a4d2b31f893346)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/ndr/ndr_misc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/librpc/ndr/ndr_misc.c b/source4/librpc/ndr/ndr_misc.c
index 0b5954d7f9..a538dd3033 100644
--- a/source4/librpc/ndr/ndr_misc.c
+++ b/source4/librpc/ndr/ndr_misc.c
@@ -37,6 +37,10 @@ NTSTATUS GUID_from_string(const char *s, struct GUID *guid)
uint32_t node[6];
int i;
+ if (s == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
if (11 == sscanf(s, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
&time_low, &time_mid, &time_hi_and_version,
&clock_seq[0], &clock_seq[1],