Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:17863
Return-Path: <mike@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 9067 invoked by uid 1010); 12 Aug 2005 08:10:18 -0000
Delivered-To: ezmlm-scan-internals@lists.php.net
Delivered-To: ezmlm-internals@lists.php.net
Received: (qmail 9052 invoked from network); 12 Aug 2005 08:10:18 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 12 Aug 2005 08:10:18 -0000
X-Host-Fingerprint: 212.183.39.95 M2459P031.adsl.highway.telekom.at  
Received: from ([212.183.39.95:29987] helo=localhost.localdomain)
	by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP
	id 79/BD-33075-A695CF24 for <internals@lists.php.net>; Fri, 12 Aug 2005 04:10:18 -0400
Message-ID: <79.BD.33075.A695CF24@pb1.pair.com>
To: internals@lists.php.net
Date: Fri, 12 Aug 2005 10:07:52 +0200
Organization: IWORKS
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.2) Gecko/20040803 [ http://iworks.at ]
X-Accept-Language: de-AT, de-DE, de, en, en-GB, en-US
MIME-Version: 1.0
X-Enigmail-Version: 0.90.0.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enigE0159EFAAC31FFF1BC667591"
X-Posted-By: 212.183.39.95
Subject: [PATCH] unicode compile fix string.c
From: mike@php.net (Michael Wallner)

--------------enigE0159EFAAC31FFF1BC667591
Content-Type: multipart/mixed;
 boundary="------------000607020501050107030302"

This is a multi-part message in MIME format.
--------------000607020501050107030302
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Possible fix for error 'void *' : unknown size

Regards,
--
Michael - < mike(@)php.net >


--------------000607020501050107030302
Content-Type: unknown/unknown;
 name="string.c.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="string.c.txt"

Index: string.c
===================================================================
RCS file: /repository/php-src/ext/standard/string.c,v
retrieving revision 1.448
diff -u -r1.448 string.c
--- string.c	12 Aug 2005 05:58:02 -0000	1.448
+++ string.c	12 Aug 2005 08:07:21 -0000
@@ -718,12 +718,12 @@
 		}
 	} else { /* Trimmed the whole string */
 		if ( return_value ) {
-			RETURN_EMPTY_UNICODE();
+			RETVAL_EMPTY_UNICODE();
 		} else {
 			return (USTR_MAKE(""));
 		}
 	}
-
+	return NULL;
 }
 /* }}} */

@@ -4728,8 +4728,8 @@
 		int l=0;
 		memcpy(result, input_str, input_str_len);
 		s = result;
-		e = result + input_str_len;
-		ee = result + result_len;
+		e = (char *) result + input_str_len;
+		ee = (char *) result + result_len;

 		while ( e < ee ) {
 			l = (e-s) < (ee-e) ? (e-s) : (ee-e);

--------------000607020501050107030302--

--------------enigE0159EFAAC31FFF1BC667591
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Cygwin)

iD8DBQFC/Fjf2pTtEijQyW0RAm7ZAJ9s7KNxCeCk/BvcLNAi5UEHM8P9ZQCfcmZ/
ZYezOn8LLJWPUlV9RSTQwPA=
=1Nrm
-----END PGP SIGNATURE-----

--------------enigE0159EFAAC31FFF1BC667591--