From 571427c7db8bb67433f84d0ef75724a5f736a9fa Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 9 Aug 2011 09:35:42 +0000 Subject: [PATCH] Avoiding strcpy usage, Make static analyzer happy --- ext/ereg/regex.patch | 12 ++++++++++++ ext/ereg/regex/regerror.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 ext/ereg/regex.patch diff --git a/ext/ereg/regex.patch b/ext/ereg/regex.patch new file mode 100644 index 0000000000..d10a9b9a46 --- /dev/null +++ b/ext/ereg/regex.patch @@ -0,0 +1,12 @@ +diff -u regex.orig/regerror.c regex/regerror.c +--- regex.orig/regerror.c 2011-08-09 17:31:11.000000000 +0800 ++++ regex/regerror.c 2011-08-09 17:29:53.000000000 +0800 +@@ -82,7 +82,7 @@ + + if (errcode®_ITOA) { + if (r->code >= 0) +- (void) strcpy(convbuf, r->name); ++ (void) strncpy(convbuf, r->name, 50); + else + sprintf(convbuf, "REG_0x%x", target); + assert(strlen(convbuf) < sizeof(convbuf)); diff --git a/ext/ereg/regex/regerror.c b/ext/ereg/regex/regerror.c index 00009a93c1..f8c3ca3538 100644 --- a/ext/ereg/regex/regerror.c +++ b/ext/ereg/regex/regerror.c @@ -82,7 +82,7 @@ size_t errbuf_size) if (errcode®_ITOA) { if (r->code >= 0) - (void) strcpy(convbuf, r->name); + (void) strncpy(convbuf, r->name, 50); else sprintf(convbuf, "REG_0x%x", target); assert(strlen(convbuf) < sizeof(convbuf)); -- 2.50.1