svn commit: samba r14131 - branches/SAMBA_3_0/source/lib branches/SAMBA_4_0/source/lib/talloc trunk/source/lib

[vlendec at samba.org]

Author: vlendec
Date: 2006-03-10 08:47:59 +0000 (Fri, 10 Mar 2006)
New Revision: 14131

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14131

Log:
Fix Coverity bug # 127
Modified:
   branches/SAMBA_3_0/source/lib/talloc.c
   branches/SAMBA_4_0/source/lib/talloc/talloc.c
   trunk/source/lib/talloc.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloc.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloc.c	2006-03-10 08:43:32 UTC (rev 14130)
+++ branches/SAMBA_3_0/source/lib/talloc.c	2006-03-10 08:47:59 UTC (rev 14131)
@@ -1026,11 +1026,13 @@
 {
 	char *ret;
 	size_t olen = strlen(orig);
-	size_t alenz = strlen(append) + 1;
+	size_t alenz;
 
 	if (!append)
 		return orig;
 
+	alenz = strlen(append) + 1;
+
 	ret = talloc_realloc(t, orig, char, olen + alenz);
 	if (!ret)
 		return NULL;

Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c	2006-03-10 08:43:32 UTC (rev 14130)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c	2006-03-10 08:47:59 UTC (rev 14131)
@@ -960,11 +960,13 @@
 {
 	char *ret;
 	size_t olen = strlen(orig);
-	size_t alenz = strlen(append) + 1;
+	size_t alenz;
 
 	if (!append)
 		return orig;
 
+	alenz = strlen(append) + 1;
+
 	ret = talloc_realloc(t, orig, char, olen + alenz);
 	if (!ret)
 		return NULL;

Modified: trunk/source/lib/talloc.c
===================================================================
--- trunk/source/lib/talloc.c	2006-03-10 08:43:32 UTC (rev 14130)
+++ trunk/source/lib/talloc.c	2006-03-10 08:47:59 UTC (rev 14131)
@@ -1026,11 +1026,13 @@
 {
 	char *ret;
 	size_t olen = strlen(orig);
-	size_t alenz = strlen(append) + 1;
+	size_t alenz;
 
 	if (!append)
 		return orig;
 
+	alenz = strlen(append) + 1;
+
 	ret = talloc_realloc(t, orig, char, olen + alenz);
 	if (!ret)
 		return NULL;