From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 May 2012 09:58:20 +0000 (+0200)
Subject: include/ttyutils: more robust get_terminal_width()
X-Git-Tag: v2.22-rc1~410
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e9a9af14fef3ad555a287a367165e4a66b8482d;p=thirdparty%2Futil-linux.git

include/ttyutils: more robust get_terminal_width()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/ttyutils.h b/include/ttyutils.h
index 15809e85a4..3c40d72a40 100644
--- a/include/ttyutils.h
+++ b/include/ttyutils.h
@@ -3,6 +3,7 @@
 
 #include <stdlib.h>
 #include <termios.h>
+#include <limits.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -97,8 +98,17 @@ static inline int get_terminal_width(void)
 		return w_win.ws_col;
 #endif
         cp = getenv("COLUMNS");
-	if (cp)
-		return strtol(cp, NULL, 10);
+	if (cp) {
+		char *end = NULL;
+		long c;
+
+		errno = 0;
+		c = strtol(cp, &end, 10);
+
+		if (errno == 0 && end && *end == '\0' && end > cp &&
+		    c > 0 && c <= INT_MAX)
+			return c;
+	}
 	return 0;
 }
 
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index aec3528b47..5268aba1e1 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -148,9 +148,11 @@ static void pretty_print_line(const char *device, const char *fs_type,
 	static int term_width = -1;
 	int len, w;
 
-	if (term_width < 0)
+	if (term_width < 0) {
 		term_width = get_terminal_width();
-
+		if (term_width <= 0)
+			term_width = 80;
+	}
 	if (term_width > 80) {
 		term_width -= 80;
 		w = term_width / 10;