From: Volker Lendecke <vl@samba.org>
Date: Fri, 27 Jun 2008 09:19:26 +0000 (+0200)
Subject: Fix an "invalid operation involving NULL pointer" found by the IBM checker
X-Git-Tag: samba-3.3.0pre1~729
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb6096a2d488d64cfa86e01be2a97e14e5773fe3;p=thirdparty%2Fsamba.git

Fix an "invalid operation involving NULL pointer" found by the IBM checker

Jerry, please check!

Volker
---

diff --git a/source/nsswitch/libwbclient/wbc_sid.c b/source/nsswitch/libwbclient/wbc_sid.c
index eb115e12976..f3d58960f2a 100644
--- a/source/nsswitch/libwbclient/wbc_sid.c
+++ b/source/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;
 	}