From dc0421d8193bedae4344d665a89ba639d1f29c8d Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 11 May 2013 09:31:12 +0200 Subject: [PATCH] Made _xml_char_to_int less prone to crashing --- src/data/spreadsheet-reader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h index e9656ab12d..5e7eaa6e46 100644 --- 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 { -- 2.30.2