aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/jit/ChangeLog5
-rw-r--r--gcc/jit/jit-recording.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 71755ff..639f8e6 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 9d6d26a..7d9da24 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