Bug 4231 pt1: fd_open() not correctly handling empty descriptions

diff --git a/src/fd.cc b/src/fd.cc
index 31018c61ff6c25eb1327635880ef27347ee7a9d6..f4adf142f912066d2e814d688a56c7a452d3db43 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -242,8 +242,7 @@ fd_open(int fd, unsigned int type, const char *desc)
 
     fdUpdateBiggest(fd, 1);
 
-    if (desc)
-        xstrncpy(F->desc, desc, FD_DESC_SZ);
+    fd_note(fd, desc);
 
     ++Number_FD;
 }
@@ -252,7 +251,10 @@ void
 fd_note(int fd, const char *s)
 {
     fde *F = &fd_table[fd];
-    xstrncpy(F->desc, s, FD_DESC_SZ);
+    if (s)
+        xstrncpy(F->desc, s, FD_DESC_SZ);
+    else
+        *(F->desc) = 0; // ""-string
 }
 
 void