diff options
| author | Xinchen Hui <laruence@php.net> | 2011-08-12 07:47:03 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-08-12 07:47:03 +0000 |
| commit | fa1883de19b15ab224740d3f8347761013627157 (patch) | |
| tree | a817d39b3b037c9f46c2c945dac0c94bb3a10765 /ext/ereg/regex | |
| parent | 96eff171611d04fc8025c0c526a589de63226a49 (diff) | |
| download | php-git-fa1883de19b15ab224740d3f8347761013627157.tar.gz | |
Omitted GCC warning "comparison is always false"
Diffstat (limited to 'ext/ereg/regex')
| -rw-r--r-- | ext/ereg/regex/regerror.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/ereg/regex/regerror.c b/ext/ereg/regex/regerror.c index 1c66d4114e..7bf741967d 100644 --- a/ext/ereg/regex/regerror.c +++ b/ext/ereg/regex/regerror.c @@ -82,10 +82,12 @@ size_t errbuf_size) break; if (errcode®_ITOA) { - if (r->code >= 0) - (void) strncpy(convbuf, r->name, 50); - else + 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 |