diff options
| author | Michael Wallner <mike@php.net> | 2015-01-30 23:05:10 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-01-30 23:05:10 +0100 |
| commit | 0d267bdecccca4deee42a9827b47aa555372ef66 (patch) | |
| tree | 8ee326d83b3e09087a78e07e9f6487c2d8401cd8 | |
| parent | c0477fbcb5a0a5e3656c143d4615133b287373a5 (diff) | |
| parent | 58638557582037d0b90b65cbe1bcb4d9b3d3e056 (diff) | |
| download | php-git-0d267bdecccca4deee42a9827b47aa555372ef66.tar.gz | |
Merge branch 'close_cor' of github.com:MegaManSec/php-src
* 'close_cor' of github.com:MegaManSec/php-src:
Fix interbase va_start
| -rw-r--r-- | ext/interbase/interbase.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 8f88d6017a..c12e045dc3 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -523,11 +523,7 @@ void _php_ibase_module_error(char *msg, ...) /* {{{ */ { va_list ap; -#ifdef ZTS - va_start(ap, ); -#else va_start(ap, msg); -#endif /* vsnprintf NUL terminates the buf and writes at most n-1 chars+NUL */ vsnprintf(IBG(errmsg), MAX_ERRMSG, msg, ap); |