svn commit: samba r23974 - in branches: SAMBA_3_2/source/nsswitch
SAMBA_3_2_0/source/nsswitch
vlendec at samba.org
vlendec at samba.org
Thu Jul 19 14:08:02 GMT 2007
Author: vlendec
Date: 2007-07-19 14:08:01 +0000 (Thu, 19 Jul 2007)
New Revision: 23974
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23974
Log:
Fix Coverity ID 361. num_rids == 0 is caught on function entry
Modified:
branches/SAMBA_3_2/source/nsswitch/wb_client.c
branches/SAMBA_3_2_0/source/nsswitch/wb_client.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/wb_client.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/wb_client.c 2007-07-19 13:47:53 UTC (rev 23973)
+++ branches/SAMBA_3_2/source/nsswitch/wb_client.c 2007-07-19 14:08:01 UTC (rev 23974)
@@ -145,7 +145,7 @@
"%ld\n", rids[i]);
}
- if ((num_rids != 0) && (ridlist == NULL)) {
+ if (ridlist == NULL) {
return False;
}
@@ -163,16 +163,11 @@
*domain_name = talloc_strdup(mem_ctx, response.data.domain_name);
- if (num_rids) {
- *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
- *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+ *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
+ *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
- if ((*names == NULL) || (*types == NULL)) {
- goto fail;
- }
- } else {
- *names = NULL;
- *types = NULL;
+ if ((*names == NULL) || (*types == NULL)) {
+ goto fail;
}
p = (char *)response.extra_data.data;
Modified: branches/SAMBA_3_2_0/source/nsswitch/wb_client.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/wb_client.c 2007-07-19 13:47:53 UTC (rev 23973)
+++ branches/SAMBA_3_2_0/source/nsswitch/wb_client.c 2007-07-19 14:08:01 UTC (rev 23974)
@@ -145,7 +145,7 @@
"%ld\n", rids[i]);
}
- if ((num_rids != 0) && (ridlist == NULL)) {
+ if (ridlist == NULL) {
return False;
}
@@ -163,16 +163,11 @@
*domain_name = talloc_strdup(mem_ctx, response.data.domain_name);
- if (num_rids) {
- *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
- *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+ *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
+ *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
- if ((*names == NULL) || (*types == NULL)) {
- goto fail;
- }
- } else {
- *names = NULL;
- *types = NULL;
+ if ((*names == NULL) || (*types == NULL)) {
+ goto fail;
}
p = (char *)response.extra_data.data;
More information about the samba-cvs
mailing list