From Jakub Zawadzki: Glib2 g_snprintf doesn't return -1;

Also: from me: fix an "off by 1" issue in inet_ntop_4
   which could result in a trailing character of the
   output string being truncated rather than an ENOSPC
   error being reported.
   

svn path=/trunk/; revision=27766

1 files changed, 2 insertions, 3 deletions

diff --git a/inet_ntop.c b/inet_ntop.c
index e240f94b65..31580c02c8 100644
--- a/inet_ntop.c
+++ b/inet_ntop.c
@@ -130,9 +130,8 @@ inet_ntop4(src, dst, size)
 	int nprinted;
 
 	nprinted = g_snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]);
-	if (nprinted < 0)
-		return (NULL);	/* we assume "errno" was set by "g_snprintf()" */
-	if ((size_t)nprinted > size) {
+        /* Note: nprinted *excludes* the trailing '\0' character */
+	if ((size_t)nprinted >= size) {
 		errno = ENOSPC;
 		return (NULL);
 	}