From cc4bb892671c039c2a5c91c21a27f1a055eb4b10 Mon Sep 17 00:00:00 2001
From: Hans Raaf <hara@oderwat.de>
Date: Fri, 29 Jul 2016 01:39:33 +0200
Subject: [PATCH] Fix for cstring nil to string nil conversion with `$`

---
 lib/system/sysstr.nim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim
index 569470aa2f..eb3d276e04 100644
--- a/lib/system/sysstr.nim
+++ b/lib/system/sysstr.nim
@@ -85,7 +85,8 @@ proc toNimStr(str: cstring, len: int): NimString {.compilerProc.} =
   copyMem(addr(result.data), str, len + 1)
 
 proc cstrToNimstr(str: cstring): NimString {.compilerRtl.} =
-  result = toNimStr(str, str.len)
+  if str == nil: NimString(nil)
+  else: toNimStr(str, str.len)
 
 proc copyString(src: NimString): NimString {.compilerRtl.} =
   if src != nil: