From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 19 Dec 2014 19:33:29 +0000 (+0000)
Subject: Handle NULL in gcc_jit_context_set_str_option
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f0858d762302ef84a5c4da165cb3129b83e7082;p=gcc.git

Handle NULL in gcc_jit_context_set_str_option

gcc/jit/ChangeLog:
	* jit-recording.c (gcc::jit::recording::context::set_str_option):
	Handle NULL.

From-SVN: r218969
---

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 71755fff91a..639f8e6cd9c 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-19  David Malcolm  <dmalcolm@redhat.com>
+
+	* jit-recording.c (gcc::jit::recording::context::set_str_option):
+	Handle NULL.
+
 2014-12-11  David Malcolm  <dmalcolm@redhat.com>
 
 	* docs/cp/topics/contexts.rst (gccjit::context::set_str_option):
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
index 9d6d26a92a1..7d9da247392 100644
--- a/gcc/jit/jit-recording.c
+++ b/gcc/jit/jit-recording.c
@@ -831,7 +831,7 @@ recording::context::set_str_option (enum gcc_jit_str_option opt,
       return;
     }
   free (m_str_options[opt]);
-  m_str_options[opt] = xstrdup (value);
+  m_str_options[opt] = value ? xstrdup (value) : NULL;
 }
 
 /* Set the given integer option for this context, or add an error if