diff options
| author | Tim Prouty <tim.prouty@isilon.com> | 2008-03-03 13:32:54 -0800 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-04-11 11:33:33 +0200 |
| commit | bb869741ddc3d82da02c96bef592dab6074ff142 (patch) | |
| tree | 4b8d6ca57ebd747ff80d1ccf28212bb8f63e7b4d /source3/web | |
| parent | 245ebca937d1a98007ad8a85fbf7cdc812ba6316 (diff) | |
| download | samba-bb869741ddc3d82da02c96bef592dab6074ff142.tar.gz samba-bb869741ddc3d82da02c96bef592dab6074ff142.tar.bz2 samba-bb869741ddc3d82da02c96bef592dab6074ff142.zip | |
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.
(This used to be commit 59124382d2894a1b194b48dd82bc5f956959eb48)
Diffstat (limited to 'source3/web')
| -rw-r--r-- | source3/web/cgi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c index c6233b0869..28f64f89ad 100644 --- a/source3/web/cgi.c +++ b/source3/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); |