From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 20 Mar 2008 23:25:42 +0000 (+0000)
Subject: MFB: Refine fix for multibyte char hanling inside command names and args
X-Git-Tag: php-5.2.6RC3~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4653fbb6ac3eb5ad6097a181e8308f2caa26f9;p=php

MFB: Refine fix for multibyte char hanling inside command names and args
---

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index e7ffa272f4..a263058951 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -273,8 +273,13 @@ char *php_escape_shell_cmd(char *str) {
 	cmd = safe_emalloc(2, l, 1);
 	
 	for (x = 0, y = 0; x < l; x++) {
+		int mb_len = php_mblen(str + x, (l - x));
+
 		/* skip non-valid multibyte characters */
-		if (php_mblen(str + x, (l - x)) < 0) {
+		if (mb_len < 0) {
+			continue;
+		} else if (mb_len > 1) {
+			x += mb_len - 1;
 			continue;
 		}
 
@@ -349,6 +354,16 @@ char *php_escape_shell_arg(char *str) {
 #endif
 
 	for (x = 0; x < l; x++) {
+		int mb_len = php_mblen(str + x, (l - x));
+
+		/* skip non-valid multibyte characters */
+		if (mb_len < 0) {
+			continue;
+		} else if (mb_len > 1) {
+			x += mb_len - 1;
+			continue;
+		}
+
 		switch (str[x]) {
 #ifdef PHP_WIN32
 		case '"':