From 5799cbdaa9528c5d275082393a14683bb3db2ca9 Mon Sep 17 00:00:00 2001
From: kelson42 <kelson@kiwix.org>
Date: Thu, 28 Aug 2014 13:36:58 -0600
Subject: [PATCH] FIXED: kiwix-serve crash if unattended search "start" & "end"
 values

---
 src/server/kiwix-serve.cpp | 10 ++--------
 static/server/taskbar.css  |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index e070c43..d95789e 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -306,14 +306,8 @@ static int accessHandlerCallback(void *cls,
     if (patternCorrespondingUrl.empty() && searcher != NULL) {
       const char* start = MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "start");
       const char* end = MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "end");
-      unsigned int startNumber = 0;
-      unsigned int endNumber = 25;
-
-      if (start != NULL)
-	startNumber = atoi(start);
-
-      if (end != NULL)
-	endNumber = atoi(end);
+      unsigned int startNumber = (start != NULL ? atoi(start) : 0);
+      unsigned int endNumber = (end != NULL ? atoi(end) : 25);
 
       /* Get the results */
       pthread_mutex_lock(&searcherLock);
diff --git a/static/server/taskbar.css b/static/server/taskbar.css
index 568325e..fbe7d8c 100644
--- a/static/server/taskbar.css
+++ b/static/server/taskbar.css
@@ -27,6 +27,7 @@
 #kiwixsearchbox {
     margin: 0px;
     float: right;
+    width: 300px;
 }
 
 #kiwixsearch {