summaryrefslogtreecommitdiff
path: root/ext/ereg/regex.patch
diff options
context:
space:
mode:
authorTjerk Meesters <datibbaw@php.net>2014-08-28 16:41:38 +0800
committerTjerk Meesters <datibbaw@php.net>2014-09-11 10:22:44 +0800
commit86de7963fe69638431c0aa8f413d25e01bf99d68 (patch)
tree4560e915002400c61de33493fc1c06705e046679 /ext/ereg/regex.patch
parente699f654f0c4b00fd4e915829842c43aa9c6f7b9 (diff)
downloadphp-git-86de7963fe69638431c0aa8f413d25e01bf99d68.tar.gz
Removing ext/ereg and dependencies
Affected extensions: - opcache (use pcre) - mbstring (removed ereg functions overloading) - pgsql (use pcre) - reflection (test cases using 'ereg') SAPI: - apache (header only) - apache_hooks (header only)
Diffstat (limited to 'ext/ereg/regex.patch')
-rw-r--r--ext/ereg/regex.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/ext/ereg/regex.patch b/ext/ereg/regex.patch
deleted file mode 100644
index 864e6bb6d8..0000000000
--- a/ext/ereg/regex.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -u regex.orig/regerror.c regex/regerror.c
---- regex.orig/regerror.c 2011-08-09 19:49:30.000000000 +0800
-+++ regex/regerror.c 2011-08-12 10:45:57.000000000 +0800
-@@ -8,6 +8,7 @@
- #include "regex.h"
- #include "utils.h"
- #include "regerror.ih"
-+#include "php.h"
-
- /*
- = #define REG_OKAY 0
-@@ -74,17 +75,19 @@
- char convbuf[50];
-
- if (errcode == REG_ATOI)
-- s = regatoi(preg, convbuf);
-+ s = regatoi(preg, convbuf, sizeof(convbuf));
- else {
- for (r = rerrs; r->code >= 0; r++)
- if (r->code == target)
- break;
-
- if (errcode&REG_ITOA) {
-- if (r->code >= 0)
-- (void) strcpy(convbuf, r->name);
-- else
-- sprintf(convbuf, "REG_0x%x", target);
-+ if (r->code >= 0) {
-+ (void) strncpy(convbuf, r->name, sizeof(convbuf) - 1);
-+ convbuf[sizeof(convbuf) - 1] = '\0';
-+ } else {
-+ snprintf(convbuf, sizeof(convbuf), "REG_0x%x", target);
-+ }
- assert(strlen(convbuf) < sizeof(convbuf));
- s = convbuf;
- } else
-@@ -106,12 +109,13 @@
-
- /*
- - regatoi - internal routine to implement REG_ATOI
-- == static char *regatoi(const regex_t *preg, char *localbuf);
-+ == static char *regatoi(const regex_t *preg, char *localbuf, int bufsize);
- */
- static char *
--regatoi(preg, localbuf)
-+regatoi(preg, localbuf, bufsize)
- const regex_t *preg;
- char *localbuf;
-+int bufsize;
- {
- register const struct rerr *r;
-
-@@ -121,6 +125,6 @@
- if (r->code < 0)
- return("0");
-
-- sprintf(localbuf, "%d", r->code);
-+ snprintf(localbuf, bufsize, "%d", r->code);
- return(localbuf);
- }
-diff -u regex.orig/regerror.ih regex/regerror.ih
---- regex.orig/regerror.ih 2011-08-09 19:49:00.000000000 +0800
-+++ regex/regerror.ih 2011-08-09 19:41:07.000000000 +0800
-@@ -4,7 +4,7 @@
- #endif
-
- /* === regerror.c === */
--static char *regatoi(const regex_t *preg, char *localbuf);
-+static char *regatoi(const regex_t *preg, char *localbuf, int bufsize);
-
- #ifdef __cplusplus
- }