]> granicus.if.org Git - php/commitdiff
fixed problem that ereg_replace() couldn't match with line stand/end marker.
authorRui Hirokawa <hirokawa@php.net>
Sun, 5 May 2002 08:39:57 +0000 (08:39 +0000)
committerRui Hirokawa <hirokawa@php.net>
Sun, 5 May 2002 08:39:57 +0000 (08:39 +0000)
ext/ereg/ereg.c
ext/standard/reg.c

index 6fff6a53524918f8baff25e134c8590cd3239ba5..ef29cae84d3261ff2dd549be4ae71b30a7d63814 100644 (file)
@@ -371,7 +371,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
                                        && subs[walk[1] - '0'].rm_so > -1
                                        && subs[walk[1] - '0'].rm_eo > -1
                                        /* this next case shouldn't happen. it does. */
-                                       && subs[walk[1] - '0'].rm_so < subs[walk[1] - '0'].rm_eo) {
+                                       && subs[walk[1] - '0'].rm_so <= subs[walk[1] - '0'].rm_eo) {
                                        tmp = subs[walk[1] - '0'].rm_eo
                                                - subs[walk[1] - '0'].rm_so;
                                        memcpy (walkbuf,
index 6fff6a53524918f8baff25e134c8590cd3239ba5..ef29cae84d3261ff2dd549be4ae71b30a7d63814 100644 (file)
@@ -371,7 +371,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
                                        && subs[walk[1] - '0'].rm_so > -1
                                        && subs[walk[1] - '0'].rm_eo > -1
                                        /* this next case shouldn't happen. it does. */
-                                       && subs[walk[1] - '0'].rm_so < subs[walk[1] - '0'].rm_eo) {
+                                       && subs[walk[1] - '0'].rm_so <= subs[walk[1] - '0'].rm_eo) {
                                        tmp = subs[walk[1] - '0'].rm_eo
                                                - subs[walk[1] - '0'].rm_so;
                                        memcpy (walkbuf,