From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 9 Dec 2014 07:05:49 +0000 (+0900)
Subject: xgettext: Avoid potential null-dereference
X-Git-Tag: v0.19.4~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3141e3fe08dfa91ba4c4bec7fed088a03d0db974;p=thirdparty%2Fgettext.git

xgettext: Avoid potential null-dereference

* xgettext.c (arglist_parser_done): Avoid potential
null-dereference.  Spotted by clang-analyzer.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 926e5abc3..cb8e1101c 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-09  Daiki Ueno  <ueno@gnu.org>
+
+	* xgettext.c (arglist_parser_done): Avoid potential
+	null-dereference.  Spotted by clang-analyzer.
+
 2014-12-09  Daiki Ueno  <ueno@gnu.org>
 
 	* msgfmt.c (msgfmt_desktop_bulk): Don't dereference potentially
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 7a4f71a25..28d28a0a8 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -3181,7 +3181,7 @@ arglist_parser_done (struct arglist_parser *ap, int argnum)
                   const char *xcomment = best_cp->xcomments.item[i];
                   bool found = false;
 
-                  if (mp->comment_dot != NULL)
+                  if (mp != NULL && mp->comment_dot != NULL)
                     {
                       size_t j;