diff options
| author | Jeremy Allison <jra@samba.org> | 2000-12-15 01:02:11 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-12-15 01:02:11 +0000 |
| commit | 369f5fd1d7a6e6298bc3cbe01e3aaed0106f6cf4 (patch) | |
| tree | e4237cf9927822e2b49faea870dd13012e5a5cb5 /source3/rpc_parse/parse_misc.c | |
| parent | 1fc3e43f9b9b431e8499d2ebd7f557b9bf2ff14c (diff) | |
| download | samba-369f5fd1d7a6e6298bc3cbe01e3aaed0106f6cf4.tar.gz samba-369f5fd1d7a6e6298bc3cbe01e3aaed0106f6cf4.tar.bz2 samba-369f5fd1d7a6e6298bc3cbe01e3aaed0106f6cf4.zip | |
Fixed memory leaks in lsa_XX calls. Fixed memory leaks in smbcacls. Merged
in fixes from appliance-head and 2.2. Fixed multiple connection.tdb open
problem.
Jeremy.
(This used to be commit 0a40bc83e14c69a09948ec09bb6fc5026c4f4c14)
Diffstat (limited to 'source3/rpc_parse/parse_misc.c')
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index dd6784a8e7..859a800771 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/rpc_parse/parse_misc.c @@ -321,7 +321,7 @@ void init_uni_hdr(UNIHDR *hdr, int len) { hdr->uni_str_len = 2 * len; hdr->uni_max_len = 2 * len; - hdr->buffer = len != 0; + hdr->buffer = len != 0 ? 1 : 0; } /******************************************************************* @@ -867,8 +867,7 @@ void init_unistr2(UNISTR2 *str, const char *buf, size_t len) { ZERO_STRUCTP(str); - /* Set up string lengths. */ - + /* set up string lengths. */ str->uni_max_len = (uint32)len; str->undoc = 0; str->uni_str_len = (uint32)len; @@ -881,7 +880,8 @@ void init_unistr2(UNISTR2 *str, const char *buf, size_t len) len *= sizeof(uint16); str->buffer = (uint16 *)talloc(parse_misc_talloc, len); - if ((str->buffer == NULL) && (len > 0)) { + if ((str->buffer == NULL) && (len > 0)) + { smb_panic("init_unistr2: malloc fail\n"); return; } |