From 87f6a9e390e5abbc95190367ead4eeab8d84d4e0 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 11 May 2005 20:38:19 +0000
Subject: [PATCH] kleines null-pointer problem.

---
 src/common/kernel/order.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/common/kernel/order.c b/src/common/kernel/order.c
index d056dc003..23cc9912c 100644
--- a/src/common/kernel/order.c
+++ b/src/common/kernel/order.c
@@ -419,13 +419,17 @@ is_persistent(const order * ord)
 char * 
 write_order(const order * ord, const struct locale * lang, char * buffer, size_t size)
 {
-  keyword_t kwd = ORD_KEYWORD(ord);
-  if (ord==0 || kwd==NOKEYWORD) {
+  if (ord==0) {
     buffer[0]=0;
   } else {
-    char * s = getcommand(ord);
-    strncpy(buffer, s, size);
-    free(s);
+    keyword_t kwd = ORD_KEYWORD(ord);
+    if (kwd==NOKEYWORD) {
+      buffer[0]=0;
+    } else {
+      char * s = getcommand(ord);
+      strncpy(buffer, s, size);
+      free(s);
+    }
   }
   return buffer;
 }