Made _xml_char_to_int less prone to crashing

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index e9656ab12d2751818abf4abf0ae2d483106b210d..5e7eaa6e4603a128ca2368934e018f0b879425b4 100644 (file)
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -45,9 +45,9 @@ bool convert_cell_ref (const char *ref,
                       int *coli, int *rowi);
 
 
-#define _xml(X) (CHAR_CAST (const xmlChar *, X))
+#define _xml(X) (CHAR_CAST (const xmlChar *, (X)))
 
-#define _xmlchar_to_int(X) (atoi(CHAR_CAST (const char *, X)))
+#define _xmlchar_to_int(X) ((X) ? atoi (CHAR_CAST (const char *, (X))) : -1)
 
 enum spreadsheet_type
   {