[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  e4505fc tdb: return unpack error on strdup failure
      from  85706c4 s3: Fix a few "warning: ISO C90 forbids mixed declarations and code"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e4505fc27bf31dbf922635fac19ea52a2a002bd4
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Aug 31 17:41:31 2012 +0200

    tdb: return unpack error on strdup failure
    
    Signed-off-by: Lars Müller <lars at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Fri Aug 31 21:05:21 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util_tdb.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index c6c6d26..8bfc75f 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -237,6 +237,9 @@ int tdb_unpack(const uint8 *buf, int bufsize, const char *fmt, ...)
 			if (bufsize < len)
 				goto no_space;
 			*ps = SMB_STRDUP((const char *)buf);
+			if (*ps == NULL) {
+				goto no_space;
+			}
 			break;
 		case 'f': /* null-terminated string */
 			s = va_arg(ap,char *);


-- 
Samba Shared Repository