diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
| commit | c4fbe2846231a6b322c1094c6a1dbf93b7305768 (patch) | |
| tree | 09eb77a294f4acda131b41fe4c9bec4ed175eb16 /source3/printing/print_generic.c | |
| parent | 1a6415fc77c708b87c8e2ce6e7828f486ffc87ac (diff) | |
| parent | 695b6662abe64a40061bfa05ede12173fc4b1945 (diff) | |
| download | samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.gz samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.bz2 samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.zip | |
Merge commit 'origin/v3-2-test' into v3-2-stable
Conflicts:
WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)
Diffstat (limited to 'source3/printing/print_generic.c')
| -rw-r--r-- | source3/printing/print_generic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index cc4b744a11..2a324fdd5c 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -41,15 +41,18 @@ static int print_run_command(int snum, const char* printername, bool do_sub, /* check for a valid system printername and valid command to run */ if ( !printername || !*printername ) { + va_end(ap); return -1; } if (!command || !*command) { + va_end(ap); return -1; } syscmd = talloc_strdup(ctx, command); if (!syscmd) { + va_end(ap); return -1; } @@ -57,6 +60,7 @@ static int print_run_command(int snum, const char* printername, bool do_sub, char *value = va_arg(ap,char *); syscmd = talloc_string_sub(ctx, syscmd, arg, value); if (!syscmd) { + va_end(ap); return -1; } } |