From 33b694c2ac8605842579973ea307484e26ce2e74 Mon Sep 17 00:00:00 2001
From: Alexandre Possebom <alexandrepossebom@gmail.com>
Date: Fri, 26 Sep 2014 17:30:05 -0300
Subject: [PATCH] Deal with wrong configuration file

---
 twik/util.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/twik/util.py b/twik/util.py
index 958c006..27563fd 100644
--- a/twik/util.py
+++ b/twik/util.py
@@ -102,11 +102,13 @@ class Util(object):
         else:
             if self.chars == None and self.config.has_option(self.profile, 'chars'):
                 self.chars = self.config.getint(self.profile, 'chars')
-            else:
-                self.chars = 12
             self.config.set(self.profile, config_key, self.chars)
             self.writeconfig()
 
+        if self.chars < 4 or self.chars > 26:
+            print 'invalid password length value from configuration using default'
+            self.chars = 12
+
         return self.chars
 
     def get_passord_type(self):
@@ -117,11 +119,14 @@ class Util(object):
         else:
             if self.pass_type == None and self.config.has_option(self.profile, 'password_type'):
                 self.pass_type = self.config.getint(self.profile, 'password_type')
-            else:
-                self.pass_type = 1
+
             self.config.set(self.profile, config_key, self.pass_type)
             self.writeconfig()
 
+        if self.pass_type < 1 or self.pass_type > 3:
+            print 'invalid password type value from configuration using default'
+            self.pass_type = 1
+
         return self.pass_type
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4