xpath unitialized vecs

This commit is contained in:
Olof Hagsand 2018-07-20 10:02:35 +00:00
parent 912d1df853
commit e79e48b46f
2 changed files with 6 additions and 3 deletions

View file

@ -1192,6 +1192,8 @@ xpath_vec(cxobj *xcur,
goto done; goto done;
} }
va_end(ap); va_end(ap);
*vec=NULL;
*veclen = 0;
#ifdef COMPAT_XSL #ifdef COMPAT_XSL
if (xpath_vec_xsl(xcur, xpath, vec, veclen) < 0) if (xpath_vec_xsl(xcur, xpath, vec, veclen) < 0)
goto done; goto done;
@ -1270,13 +1272,14 @@ xpath_vec_flag(cxobj *xcur,
goto done; goto done;
} }
va_end(ap); va_end(ap);
*vec=NULL;
*veclen = 0;
#ifdef COMPAT_XSL #ifdef COMPAT_XSL
if (xpath_vec_flag_xsl(xcur, xpath, flags, vec, veclen) < 0) if (xpath_vec_flag_xsl(xcur, xpath, flags, vec, veclen) < 0)
goto done; goto done;
#else #else
if (xpath_vec_ctx(xcur, xpath, &xr) < 0) if (xpath_vec_ctx(xcur, xpath, &xr) < 0)
goto done; goto done;
if (xr && xr->xc_type == XT_NODESET){ if (xr && xr->xc_type == XT_NODESET){
for (i=0; i<xr->xc_size; i++){ for (i=0; i<xr->xc_size; i++){
x = xr->xc_nodeset[i]; x = xr->xc_nodeset[i];