From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 8 May 2014 10:57:35 +0000 (+0100)
Subject: recode update for phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9cfbb8ea1e79d0653029a0b6294e7352acb80f4;p=php

recode update for phpng
---

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 3fff0a7f7f..07f0332af6 100644
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -171,7 +171,7 @@ PHP_FUNCTION(recode_string)
 error_exit:
 		RETVAL_FALSE;
 	} else {
-		RETVAL_STRINGL(r, r_len, 1);
+		RETVAL_STRINGL(r, r_len);
 		free(r);
 	}
 
@@ -196,8 +196,8 @@ PHP_FUNCTION(recode_file)
 	 	return;
 	}
 
-	php_stream_from_zval(instream, &input);
-	php_stream_from_zval(outstream, &output);
+	php_stream_from_zval(instream, input);
+	php_stream_from_zval(outstream, output);
 
 	if (FAILURE == php_stream_cast(instream, PHP_STREAM_AS_STDIO, (void**)&in_fp, REPORT_ERRORS))	{
 		RETURN_FALSE;