The branch, master has been updated via bebf90f libwbclient: Fix CID 1414781 Dereference null return value via 9c68f99 spoolss: Fix CID 1414784 Uninitialized scalar variable from 3799a32 CVE-2017-11103: Orpheus' Lyre KDC-REP service name validation
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bebf90f7a101e0180e39e0332f2a1b1023ea0437 Author: Volker Lendecke <v...@samba.org> Date: Tue Jul 11 16:04:01 2017 +0200 libwbclient: Fix CID 1414781 Dereference null return value Basically a cut&paste error from somewhere else Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Wed Jul 12 22:12:22 CEST 2017 on sn-devel-144 commit 9c68f99654c851491a4fb499a358af6c400a8dea Author: Volker Lendecke <v...@samba.org> Date: Tue Jul 11 13:50:09 2017 +0200 spoolss: Fix CID 1414784 Uninitialized scalar variable "struct tm" can contain more members than we explicitly initialize. Initialize them all. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: nsswitch/libwbclient/wbc_sid.c | 2 +- source3/rpc_client/init_spoolss.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c index baaeb60..77445af 100644 --- a/nsswitch/libwbclient/wbc_sid.c +++ b/nsswitch/libwbclient/wbc_sid.c @@ -812,7 +812,7 @@ wbcErr wbcCtxGetSidAliases(struct wbcContext *ctx, rids = (uint32_t *)wbcAllocateMemory(response.data.num_entries, sizeof(uint32_t), NULL); - BAIL_ON_PTR_ERROR(sids, wbc_status); + BAIL_ON_PTR_ERROR(rids, wbc_status); s = (const char *)response.extra_data.data; for (i = 0; i < response.data.num_entries; i++) { diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c index a806fc6..e5f70c0 100644 --- a/source3/rpc_client/init_spoolss.c +++ b/source3/rpc_client/init_spoolss.c @@ -48,15 +48,15 @@ bool init_systemtime(struct spoolss_Time *r, time_t spoolss_Time_to_time_t(const struct spoolss_Time *r) { - struct tm unixtime; - - unixtime.tm_year = r->year - 1900; - unixtime.tm_mon = r->month - 1; - unixtime.tm_wday = r->day_of_week; - unixtime.tm_mday = r->day; - unixtime.tm_hour = r->hour; - unixtime.tm_min = r->minute; - unixtime.tm_sec = r->second; + struct tm unixtime = { + .tm_year = r->year - 1900, + .tm_mon = r->month - 1, + .tm_wday = r->day_of_week, + .tm_mday = r->day, + .tm_hour = r->hour, + .tm_min = r->minute, + .tm_sec = r->second, + }; return mktime(&unixtime); } -- Samba Shared Repository