generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-09 19:27:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix vis family of functions to not leak

Browse Source 
The code uses an internal helper function to avoid code repetition. But
to get there, the function takes a pointer to a pointer, so that the few
functions that require returning an allocated buffer can get hold of it
this way.

The problem is that the user might pass a NULL pointer and trigger an
internal allocation even if the functions are not expected to do so.

Add a new internal helper for non-allocations, that will assert that
condition, and make any other function that requires this behavior call
this one instead.

Warned-by: coverity
This commit is contained in:
Guillem Jover 2018-06-06 05:41:34 +02:00
parent 13c32916b4
commit 8e2d55047c
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/vis.c
View File

@ -580,10 +580,20 @@ out:
} }
static int static int
istrsenvisxl(char **mbdstp, size_t *dlen, const char *mbsrc, istrsenvisxna(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
int flags, const char *mbextra, int *cerr_ptr) int flags, const char *mbextra, int *cerr_ptr)
{ {
return istrsenvisx(mbdstp, dlen, mbsrc, assert(mbdst != NULL);
return istrsenvisx(&mbdst, dlen, mbsrc, mblength,
flags, mbextra, cerr_ptr);
}
static int
istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
int flags, const char *mbextra, int *cerr_ptr)
{
return istrsenvisxna(mbdst, dlen, mbsrc,
mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr); mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
} }
@ -628,33 +638,33 @@ snvis(char *mbdst, size_t dlen, int c, int flags, int nextc, const char *mbextra
int int
strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra) strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
{ {
return istrsenvisxl(&mbdst, NULL, mbsrc, flags, mbextra, NULL); return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
} }
int int
strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra) strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
{ {
return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, mbextra, NULL); return istrsenvisxl(mbdst, &dlen, mbsrc, flags, mbextra, NULL);
} }
int int
strsvisx(char *mbdst, const char *mbsrc, size_t len, int flags, const char *mbextra) strsvisx(char *mbdst, const char *mbsrc, size_t len, int flags, const char *mbextra)
{ {
return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, mbextra, NULL); return istrsenvisxna(mbdst, NULL, mbsrc, len, flags, mbextra, NULL);
} }
int int
strsnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags, strsnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
const char *mbextra) const char *mbextra)
{ {
return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, NULL); return istrsenvisxna(mbdst, &dlen, mbsrc, len, flags, mbextra, NULL);
} }
int int
strsenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags, strsenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
const char *mbextra, int *cerr_ptr) const char *mbextra, int *cerr_ptr)
{ {
return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr); return istrsenvisxna(mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr);
} }
/* /*
@ -701,7 +711,7 @@ nvis(char *mbdst, size_t dlen, int c, int flags, int nextc)
int int
strvis(char *mbdst, const char *mbsrc, int flags) strvis(char *mbdst, const char *mbsrc, int flags)
{ {
return istrsenvisxl(&mbdst, NULL, mbsrc, flags, "", NULL); return istrsenvisxl(mbdst, NULL, mbsrc, flags, "", NULL);
} }
/* /*
@ -721,14 +731,14 @@ strvis(char *mbdst, const char *mbsrc, int flags)
int int
strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags) strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags)
{ {
return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
} }
__asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2"); __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2");
int int
strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags) strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags)
{ {
return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
} }
__asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1"); __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1");
@ -736,7 +746,8 @@ int
stravis(char **mbdstp, const char *mbsrc, int flags) stravis(char **mbdstp, const char *mbsrc, int flags)
{ {
*mbdstp = NULL; *mbdstp = NULL;
return istrsenvisxl(mbdstp, NULL, mbsrc, flags, "", NULL); return istrsenvisx(mbdstp, NULL, mbsrc,
mbsrc != NULL ? strlen(mbsrc) : 0, flags, "", NULL);
} }
/* /*
@ -753,18 +764,18 @@ stravis(char **mbdstp, const char *mbsrc, int flags)
int int
strvisx(char *mbdst, const char *mbsrc, size_t len, int flags) strvisx(char *mbdst, const char *mbsrc, size_t len, int flags)
{ {
return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, "", NULL); return istrsenvisxna(mbdst, NULL, mbsrc, len, flags, "", NULL);
} }
int int
strnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags) strnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags)
{ {
return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", NULL); return istrsenvisxna(mbdst, &dlen, mbsrc, len, flags, "", NULL);
} }
int int
strenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags, strenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
int *cerr_ptr) int *cerr_ptr)
{ {
return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr); return istrsenvisxna(mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr);
} }