From 2a5dee28928d412216bfbcbba0f6bc8352ca6674 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Fri, 27 Jun 2008 11:19:26 +0200
Subject: Fix an "invalid operation involving NULL pointer" found by the IBM
 checker

Jerry, please check!

Volker
(This used to be commit eb6096a2d488d64cfa86e01be2a97e14e5773fe3)
---
 source3/nsswitch/libwbclient/wbc_sid.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3/nsswitch/libwbclient')

diff --git a/source3/nsswitch/libwbclient/wbc_sid.c b/source3/nsswitch/libwbclient/wbc_sid.c
index eb115e1297..f3d58960f2 100644
--- a/source3/nsswitch/libwbclient/wbc_sid.c
+++ b/source3/nsswitch/libwbclient/wbc_sid.c
@@ -141,9 +141,13 @@ wbcErr wbcStringToSid(const char *str,
 	while (sid->num_auths < WBC_MAXSUBAUTHS) {
 		if ((x=(uint32_t)strtoul(p, &q, 10)) == 0)
 			break;
+		if (q == NULL) {
+			wbc_status = WBC_ERR_INVALID_SID;
+			BAIL_ON_WBC_ERROR(wbc_status);
+		}
 		sid->sub_auths[sid->num_auths++] = x;
 
-		if (q && ((*q!='-') || (*q=='\0')))
+		if ((*q!='-') || (*q=='\0'))
 			break;
 		p = q + 1;
 	}
-- 
cgit