From bb869741ddc3d82da02c96bef592dab6074ff142 Mon Sep 17 00:00:00 2001
From: Tim Prouty <tim.prouty@isilon.com>
Date: Mon, 3 Mar 2008 13:32:54 -0800
Subject: 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)
---
 source3/web/cgi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web/cgi.c')

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);
-- 
cgit