contrib/apr: Remove scope leak UB

In apr_vformatter, the variable buf was declared inside a limited scope
region, but a pointer to it is leaked outside of that region and used
later.  This is undefined behavior.  Fix by moving the buf variable to
function scope.

Reported by:	Coverity
CID:		1192541
This commit is contained in:
Conrad Meyer 2020-01-30 17:50:51 +00:00
parent cca46c5e69
commit e3907d2395
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=357299

View File

@ -708,6 +708,7 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
char num_buf[NUM_BUF_SIZE];
char char_buf[2]; /* for printing %% and %<unknown> */
char buf[5]; /* for printing %B, %F, and %S */
enum var_type_enum {
IS_QUAD, IS_LONG, IS_SHORT, IS_INT
@ -1246,7 +1247,6 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
case 'F':
case 'S':
{
char buf[5];
apr_off_t size = 0;
if (*fmt == 'B') {