The branch, master has been updated
via cdb9e4b libwbclient: Add some input check
via c22151e libwbclient: Remove a pointless check
from 494d497 tevent: change version to 0.9.11
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cdb9e4b8fec1bc8b3e8af05c10b436e6d84b57d3
Author: Volker Lendecke <[email protected]>
Date: Wed Mar 9 10:58:47 2011 +0100
libwbclient: Add some input check
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Thu Mar 10 11:10:30 CET 2011 on sn-devel-104
commit c22151ea3a7fe0e07e46802ec7cd57ba1694262f
Author: Volker Lendecke <[email protected]>
Date: Tue Mar 8 18:24:08 2011 +0100
libwbclient: Remove a pointless check
-----------------------------------------------------------------------
Summary of changes:
nsswitch/libwbclient/wbc_sid.c | 3 ++-
nsswitch/wb_common.c | 4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index e94d874..e8148aa 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -152,8 +152,9 @@ wbcErr wbcStringToSid(const char *str,
}
sid->sub_auths[sid->num_auths++] = x;
- if ((*q!='-') || (*q=='\0'))
+ if (*q != '-') {
break;
+ }
p = q + 1;
}
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c
index 2a1795c..dcfc8a5 100644
--- a/nsswitch/wb_common.c
+++ b/nsswitch/wb_common.c
@@ -514,6 +514,10 @@ static int winbindd_read_reply(struct winbindd_response
*response)
return -1;
}
+ if (response->length < sizeof(struct winbindd_response)) {
+ return -1;
+ }
+
/* We actually send the pointer value of the extra_data field from
the server. This has no meaning in the client's address space
so we clear it out. */
--
Samba Shared Repository
