The branch, master has been updated
via 2d087a0c156dc95086a39e297b24ef6889e1a50d (commit)
from 5603c0f2ba9d5b90e5f8b71e779ec037053f04f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2d087a0c156dc95086a39e297b24ef6889e1a50d
Author: Volker Lendecke <[email protected]>
Date: Thu Mar 26 14:54:18 2009 +0100
Fix a talloc/malloc screwup in file_lines_pload
Another bug due to careless merge to /lib :-(((
Volker
-----------------------------------------------------------------------
Summary of changes:
source3/lib/util_file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index c5a9b7c..50ff844 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -39,7 +39,7 @@ static char *file_pload(const char *syscmd, size_t *size)
total = 0;
while ((n = read(fd, buf, sizeof(buf))) > 0) {
- p = (char *)SMB_REALLOC(p, total + n + 1);
+ p = talloc_realloc(NULL, p, char, total + n + 1);
if (!p) {
DEBUG(0,("file_pload: failed to expand buffer!\n"));
close(fd);
--
Samba Shared Repository
