diff options
| author | Herb Lewis <herb@samba.org> | 2004-01-14 22:53:50 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2004-01-14 22:53:50 +0000 |
| commit | be1b3604ef3d351b1e3013a509dcceb5fed8409f (patch) | |
| tree | 6f47752a7293d9a43ee809282fbe4c9cea068cc8 | |
| parent | 2624dd03136a9c2a6e9ed39c97094cde0aa67723 (diff) | |
| download | samba-be1b3604ef3d351b1e3013a509dcceb5fed8409f.tar.gz samba-be1b3604ef3d351b1e3013a509dcceb5fed8409f.tar.bz2 samba-be1b3604ef3d351b1e3013a509dcceb5fed8409f.zip | |
source/rpc_parse/parse_prs.c ZERO_STRUCTP(ps) not needed as it is done
in prs_init now
testsuite/printing/psec.c cannot do a prs_mem_free() when tdb_prs_fetch fails
as the prs structure has not been initialized
(This used to be commit a363e5d8c549861329506bd87c11d82ace5520e5)
| -rw-r--r-- | source3/rpc_parse/parse_prs.c | 1 | ||||
| -rw-r--r-- | testsuite/printing/psec.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c index 58652fa0c5..0e5a25fe8c 100644 --- a/source3/rpc_parse/parse_prs.c +++ b/source3/rpc_parse/parse_prs.c @@ -1307,7 +1307,6 @@ int tdb_prs_fetch(TDB_CONTEXT *tdb, char *keystr, prs_struct *ps, TALLOC_CTX *me if (!dbuf.dptr) return -1; - ZERO_STRUCTP(ps); prs_init(ps, 0, mem_ctx, UNMARSHALL); prs_give_memory(ps, dbuf.dptr, dbuf.dsize, True); diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c index 9d38b9b10a..7ba40b18a3 100644 --- a/testsuite/printing/psec.c +++ b/testsuite/printing/psec.c @@ -195,8 +195,11 @@ int psec_getsec(char *printer) if (tdb_prs_fetch(tdb, keystr, &ps, mem_ctx) != 0) { printf("error fetching descriptor for printer %s\n", printer); - result = 1; - goto done; + /* cannot do a prs_mem_free() when tdb_prs_fetch fails */ + /* as the prs structure has not been initialized */ + tdb_close(tdb); + talloc_destroy(mem_ctx); + return 1; } /* Unpack into security descriptor buffer */ |