* A possible NULL pointer deref was fixed in the JSON code for

persisting time periods (start+end). Fixes #282. Thanks to @marcstern for finding this.
icing · Apr 22, 2022 · 0d87776 · 0d87776
1 parent 54bbcc5
commit 0d87776
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+ * A possible NULL pointer deref was fixed in the JSON code for
+   persisting time periods (start+end). Fixes #282.
+   Thanks to @marcstern for finding this.
+
 v2.4.12
 ----------------------------------------------------------------------------------------------------
  * Implement full auto status ("key: value" type status output).

diff --git a/src/md_json.c b/src/md_json.c
@@ -1264,7 +1264,7 @@ apr_status_t md_json_set_timeperiod(const md_timeperiod_t *tp, md_json_t *json,
     const char *key;
     apr_status_t rv;
 
-    if (!tp || tp->start || tp->end) {
+    if (tp && tp->start && tp->end) {
         jn = json_object();
         apr_rfc822_date(ts, tp->start);
         json_object_set_new(jn, "from", json_string(ts));