From 13b443ebb3f8d1b5d52a38ad06285c2e6e296f5f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 16 Nov 2014 12:46:55 +0100
Subject: [PATCH] fix crash (null pointer in make_cmd)

---
 src/build.h   |  2 +-
 src/economy.c | 41 ++++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/build.h b/src/build.h
index 1ab97b086..691d9def3 100644
--- a/src/build.h
+++ b/src/build.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 3
-#define VERSION_BUILD 689
+#define VERSION_BUILD 690
diff --git a/src/economy.c b/src/economy.c
index 7f4bf506c..3faf3c5d5 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -1788,11 +1788,11 @@ static void create_item(unit * u, const item_type * itype, int want)
 int make_cmd(unit * u, struct order *ord)
 {
     region *r = u->region;
-    const building_type *btype;
-    const ship_type *stype;
-    param_t p;
-    int m;
-    const item_type *itype;
+    const building_type *btype = 0;
+    const ship_type *stype = 0;
+    const item_type *itype = 0;
+    param_t p = NOPARAM;
+    int m = INT_MAX;
     const char *s;
     const struct locale *lang = u->faction->locale;
     char ibuf[16];
@@ -1802,17 +1802,19 @@ int make_cmd(unit * u, struct order *ord)
     assert(kwd == K_MAKE);
     s = getstrtoken();
 
-    m = atoi((const char *)s);
-    sprintf(ibuf, "%d", m);
-    if (!strcmp(ibuf, (const char *)s)) {
-        /* first came a want-paramter */
-        s = getstrtoken();
+    if (s) {
+        m = atoi((const char *)s);
+        sprintf(ibuf, "%d", m);
+        if (!strcmp(ibuf, (const char *)s)) {
+            /* a quantity was given */
+            s = getstrtoken();
+        } else {
+            m = INT_MAX;
+        }
+        if (s) {
+            p = findparam(s, u->faction->locale);
+        }
     }
-    else {
-        m = INT_MAX;
-    }
-
-    p = findparam(s, u->faction->locale);
 
     if (p == P_ROAD) {
         plane *pl = rplane(r);
@@ -1851,10 +1853,11 @@ int make_cmd(unit * u, struct order *ord)
      * 'academy of arts', we need to figure out what the player meant.
      * This is not 100% safe.
      */
-    stype = findshiptype(s, lang);
-    btype = findbuildingtype(s, lang);
-    itype = finditemtype(s, lang);
-
+    if (s) {
+        stype = findshiptype(s, lang);
+        btype = findbuildingtype(s, lang);
+        itype = finditemtype(s, lang);
+    }
     if (itype != NULL && (btype != NULL || stype != NULL)) {
         if (itype->construction == NULL) {
             /* if the item cannot be made, we probably didn't mean to make it */