]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Fri, 6 Jul 2018 14:08:57 +0000 (16:08 +0200)
committerAnatol Belski <ab@php.net>
Fri, 6 Jul 2018 14:08:57 +0000 (16:08 +0200)
* PHP-7.2:
  Fix event log handling in startup phase
  Fix bug #76488 Memory leak when fetching a BLOB field

1  2 
ext/pdo_firebird/firebird_statement.c
win32/wsyslog.c

Simple merge
diff --cc win32/wsyslog.c
index aebb42db622b0d158daccbac2ead33123d6d01aa,73f9969a78ba883e1390eec1a9ca25b237aa19f3..695c7db8cd11e76f985cc0dcea12fe39f006a1b9
@@@ -146,8 -125,11 +146,10 @@@ void openlog(const char *ident, int log
        closelog();
  
        PW32G(log_source) = RegisterEventSource(NULL, "PHP-" PHP_VERSION);
-       spprintf(&PW32G(log_header), 0, (logopt & LOG_PID) ? "%s[%d]" : "%s", ident, getpid());
+       header_len = strlen(ident) + 2 + 11;
+       PW32G(log_header) = malloc(header_len*sizeof(char));
+       sprintf_s(PW32G(log_header), header_len, (logopt & LOG_PID) ? "%s[%d]" : "%s", ident, getpid());
  }
 -
  /*
   * Local variables:
   * tab-width: 4