From 3f20f4cd953507a2cb1eddd6207a9c66010fc4a6 Mon Sep 17 00:00:00 2001
From: Krisztian Litkey <krisztian.litkey@intel.com>
Date: Thu, 13 Dec 2012 17:39:14 +0200
Subject: [PATCH] murphy-db: handle NULL varchar columns gracefully.

---
 src/murphy-db/mdb/column.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/murphy-db/mdb/column.c b/src/murphy-db/mdb/column.c
index 581871e..3e61920 100644
--- a/src/murphy-db/mdb/column.c
+++ b/src/murphy-db/mdb/column.c
@@ -51,6 +51,7 @@ void mdb_column_write(mdb_column_t      *dst_desc, void *dst_data,
 {
     int lgh;
     void *dst, *src;
+    static char *empty = "";
 
     if (dst_desc && dst_data && src_desc && src_desc->offset >= 0 && src_data){
         dst = dst_data + dst_desc->offset;
@@ -60,6 +61,8 @@ void mdb_column_write(mdb_column_t      *dst_desc, void *dst_data,
         switch (dst_desc->type) {
 
         case mqi_varchar:
+            if(__builtin_expect(*((char**)src) == NULL, 0))
+                src = &empty;
             memset(dst, 0, lgh);
             strncpy((char *)dst, *(const char **)src, lgh-1);
             break;
-- 
2.7.4