[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-586-gc253e80

[Volker Lendecke]

The branch, v3-4-test has been updated
       via  c253e80ad21a24395a973b23993dd211b8e0d482 (commit)
      from  a7c80bb70e0153568bc26c0dac044458d47dae0a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit c253e80ad21a24395a973b23993dd211b8e0d482
Author: Volker Lendecke <v...@samba.org>
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