| Message ID | 20140513091658.20413.10155.stgit@nfdev.cica.es |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, May 13, 2014 at 11:17:49AM +0200, Arturo Borrero Gonzalez wrote: > When _snprintf() reports it would print n characters, that n doesn't include > the trailing \0 that snprintf adds. > > Thus, we need to [re]allocate n+1 characters. > > While at it, change the reallocation trigger. If the length of the buffer we > used is equals to the expanded string length, the output has been truncated. > In other words, if ret == bufsiz, then the trailing \0 is missing. > > Also, check if _snprintf() returned < 0, which means an error ocurred. Applied, thanks Arturo. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/utils.c b/src/utils.c index 18917f5..20a2fa3 100644 --- a/src/utils.c +++ b/src/utils.c @@ -195,17 +195,24 @@ int nft_fprintf(FILE *fp, void *obj, uint32_t type, uint32_t flags, int ret; ret = snprintf_cb(buf, bufsiz, obj, type, flags); - if (ret > NFT_SNPRINTF_BUFSIZ) { - buf = calloc(1, ret); + if (ret < 0) + goto out; + + if (ret >= NFT_SNPRINTF_BUFSIZ) { + bufsiz = ret + 1; + + buf = malloc(bufsiz); if (buf == NULL) return -1; - bufsiz = ret; ret = snprintf_cb(buf, bufsiz, obj, type, flags); + if (ret < 0) + goto out; } ret = fprintf(fp, "%s", buf); +out: if (buf != _buf) xfree(buf);
When _snprintf() reports it would print n characters, that n doesn't include the trailing \0 that snprintf adds. Thus, we need to [re]allocate n+1 characters. While at it, change the reallocation trigger. If the length of the buffer we used is equals to the expanded string length, the output has been truncated. In other words, if ret == bufsiz, then the trailing \0 is missing. Also, check if _snprintf() returned < 0, which means an error ocurred. Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> --- v2: check if snprintf() calls failed. Replace calloc with malloc. src/utils.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html