diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-01-23 13:08:14 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-01-23 13:08:14 +1100 |
| commit | 39d172bf34d0cbb3bf3e3a04d534876097cdccb5 (patch) | |
| tree | 3a32fd867e34c9a86c3a2f01308445b76bf2d50c /source3/lib/util_str.c | |
| parent | 2caa0e82f5ff2f45a5c912c624e54c4a43f0c3cc (diff) | |
| parent | 9051199e40dec27d3532fbec7f5744033def1874 (diff) | |
| download | samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.gz samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.bz2 samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit bc2973df8504850a40cb0a1172689dc0bdafa323)
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 3e3268104c..bcb9197141 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -2415,13 +2415,13 @@ void base64_decode_inplace(char *s) } /** - * Encode a base64 string into a malloc()ed string caller to free. + * Encode a base64 string into a talloc()ed string caller to free. * * From SQUID: adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c * with adjustments **/ -char *base64_encode_data_blob(DATA_BLOB data) +char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data) { int bits = 0; int char_count = 0; @@ -2434,7 +2434,7 @@ char *base64_encode_data_blob(DATA_BLOB data) out_cnt = 0; len = data.length; output_len = data.length * 2; - result = TALLOC_ARRAY(talloc_tos(), char, output_len); /* get us plenty of space */ + result = TALLOC_ARRAY(mem_ctx, char, output_len); /* get us plenty of space */ SMB_ASSERT(result != NULL); while (len-- && out_cnt < (data.length * 2) - 5) { |