From 06d87fec2b7e7dae2bfad7a23692451feb1cd814 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 28 May 2013 20:14:49 +0100
Subject: if the colour value is unusable do not assign garbage to teh option

---
 utils/nsoption.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'utils/nsoption.c')

diff --git a/utils/nsoption.c b/utils/nsoption.c
index e2fe225f2..b5add5f91 100644
--- a/utils/nsoption.c
+++ b/utils/nsoption.c
@@ -103,10 +103,11 @@ strtooption(const char *value, struct nsoption_s *option)
 		break;
 
 	case OPTION_COLOUR:
-		sscanf(value, "%x", &rgbcolour);
-		option->value.c = (((0x000000FF & rgbcolour) << 16) |
-				   ((0x0000FF00 & rgbcolour) << 0) |
-				   ((0x00FF0000 & rgbcolour) >> 16));
+		if (sscanf(value, "%x", &rgbcolour) == 1) {
+			option->value.c = (((0x000000FF & rgbcolour) << 16) |
+					   ((0x0000FF00 & rgbcolour) << 0) |
+					   ((0x00FF0000 & rgbcolour) >> 16));
+		}
 		break;
 
 	case OPTION_STRING:
-- 
cgit v1.2.3