summaryrefslogtreecommitdiff
path: root/source/web
diff options
context:
space:
mode:
authorTim Prouty <tim.prouty@isilon.com>2008-03-03 13:32:54 -0800
committerVolker Lendecke <vl@samba.org>2008-04-11 11:33:33 +0200
commit59124382d2894a1b194b48dd82bc5f956959eb48 (patch)
treee73d7f4832087c4726081bc9e30bb7fb3f4bf979 /source/web
parent448a8fe6c15bc4e85149d1ae821f0ebc2e3edde5 (diff)
downloadsamba-59124382d2894a1b194b48dd82bc5f956959eb48.tar.gz
Cleanup size_t return values in convert_string_allocate
This patch is the first iteration of an inside-out conversion to cleanup functions in charcnv.c returning size_t == -1 to indicate failure.
Diffstat (limited to 'source/web')
-rw-r--r--source/web/cgi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/web/cgi.c b/source/web/cgi.c
index c6233b08694..28f64f89ade 100644
--- a/source/web/cgi.c
+++ b/source/web/cgi.c
@@ -202,19 +202,19 @@ void cgi_load_variables(void)
to our internal unix charset before use */
for (i=0;i<num_variables;i++) {
TALLOC_CTX *frame = talloc_stackframe();
- char *dest;
+ char *dest = NULL;
+ size_t dest_len;
- dest = NULL;
convert_string_allocate(frame, CH_UTF8, CH_UNIX,
variables[i].name, -1,
- &dest, True);
+ &dest, &dest_len, True);
SAFE_FREE(variables[i].name);
variables[i].name = SMB_STRDUP(dest ? dest : "");
dest = NULL;
convert_string_allocate(frame, CH_UTF8, CH_UNIX,
variables[i].value, -1,
- &dest, True);
+ &dest, &dest_len, True);
SAFE_FREE(variables[i].value);
variables[i].value = SMB_STRDUP(dest ? dest : "");
TALLOC_FREE(frame);