[PATCH] Teach copy_string to return NULL on empty string
Anton Lundin
glance at acc.umu.se
Sat Jun 27 03:58:47 PDT 2015
In subsurface we store no value as a NULL pointer everywhere, but
sometimes some structures returns a empty field as a empty string.
This teaches our helper copy_string to return NULL if you try to copy a
empty string.
This fixes a bug where we store buddy and divemaster in git as empty
strings if they passed via MainTab::saveTaggedStrings().
Suggested-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
dive.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dive.h b/dive.h
index f07c9d9..318f822 100644
--- a/dive.h
+++ b/dive.h
@@ -32,7 +32,7 @@ static inline int same_string(const char *a, const char *b)
static inline char *copy_string(const char *s)
{
- return s ? strdup(s) : NULL;
+ return (s && *s) ? strdup(s) : NULL;
}
#include <libxml/tree.h>
--
2.1.4
More information about the subsurface
mailing list