From: Michael Wallner <mike@php.net>
Date: Mon, 17 Jul 2006 20:36:47 +0000 (+0000)
Subject: - fix bug #37945 pathinfo() cannot handle argument with special characters
X-Git-Tag: php-5.2.0RC1~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0fcaa7acbc012f850a4a5836f36daeb527337c3;p=php

- fix bug #37945 pathinfo() cannot handle argument with special characters
  like german "Umlaute"
---

diff --git a/NEWS b/NEWS
index 4f89ff8b96..6b5b34b6a8 100644
--- a/NEWS
+++ b/NEWS
@@ -102,6 +102,8 @@ PHP                                                                        NEWS
   private constructors from invalid context). (Tony)
 - Fixed bug #37987 (invalid return of file_exists() in safe mode). (Ilia)
 - Fixed bug #37947 (zend_ptr_stack reallocation problem). (Dmitry)
+- Fixed bug #37945 (pathinfo() cannot handle argument with special characters
+  like german "Umlaute"). (Mike)
 - Fixed bug #37931 (possible crash in OCI8 after database restart 
   when using persistent connections). (Tony)
 - Fixed bug #37920 (compilation problems on z/OS). (Tony)
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 3323f306af..2eacd3ead0 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1173,7 +1173,12 @@ PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char
 						state = 1;
 					}
 				}
+				break;
 			default:
+				if (state == 0) {
+					comp = c;
+					state = 1;
+				}
 				break;
 		}
 		c += inc_len;