diff options
| author | Jeremy Allison <jra@samba.org> | 2006-06-20 19:06:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:18:52 -0500 |
| commit | f014291edda9449c73757063fc306d564445cc18 (patch) | |
| tree | 8742ef705a0d2a5eb2a3b0483a56d446c6becff0 /source3/printing | |
| parent | a167c2c09eb1e3cc9a9f22974d726fcdb6ee218d (diff) | |
| download | samba-f014291edda9449c73757063fc306d564445cc18.tar.gz samba-f014291edda9449c73757063fc306d564445cc18.tar.bz2 samba-f014291edda9449c73757063fc306d564445cc18.zip | |
r16424: Fix possible null deref and a memory leak found by
examining Klockwork #1519. get_printer_subkeys()
could return zero without initializing it's return
pointer arg. Fixed this. Added free of subkey pointer
return in registry/reg_printing.c (interesting that
neithe Coverity or Klocwork found this one).
Jeremy.
(This used to be commit 4fbeae1a3ac3499e5d9f566655cbafccd9d691cb)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 6a7fd4d398..5c4039722e 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2767,6 +2767,8 @@ int get_printer_subkeys( NT_PRINTER_DATA *data, const char* key, fstring **subke fstring *subkeys_ptr = NULL; fstring subkeyname; + *subkeys = NULL; + if ( !data ) return 0; |