svn commit: r1900145 - in /httpd/httpd/trunk: changes-entries/md_timeperiod_null.txt modules/md/md_json.c modules/md/md_version.h

[ic...@apache.org]

Author: icing
Date: Fri Apr 22 08:45:31 2022
New Revision: 1900145

URL: http://svn.apache.org/viewvc?rev=1900145&view=rev
Log:
  *) mod_md: a possible NULL pointer deref was fixed in
     the JSON code for persisting time periods (start+end).
     Fixes #282 on mod_md's github.


Added:
    httpd/httpd/trunk/changes-entries/md_timeperiod_null.txt
Modified:
    httpd/httpd/trunk/modules/md/md_json.c
    httpd/httpd/trunk/modules/md/md_version.h

Added: httpd/httpd/trunk/changes-entries/md_timeperiod_null.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/md_timeperiod_null.txt?rev=1900145&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/md_timeperiod_null.txt (added)
+++ httpd/httpd/trunk/changes-entries/md_timeperiod_null.txt Fri Apr 22 08:45:31 2022
@@ -0,0 +1,4 @@
+  *) mod_md: a possible NULL pointer deref was fixed in
+     the JSON code for persisting time periods (start+end).
+     Fixes #282 on mod_md's github.
+     Thanks to @marcstern for finding this.

Modified: httpd/httpd/trunk/modules/md/md_json.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_json.c?rev=1900145&r1=1900144&r2=1900145&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_json.c (original)
+++ httpd/httpd/trunk/modules/md/md_json.c Fri Apr 22 08:45:31 2022
@@ -1264,7 +1264,7 @@ apr_status_t md_json_set_timeperiod(cons
     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));

Modified: httpd/httpd/trunk/modules/md/md_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_version.h?rev=1900145&r1=1900144&r2=1900145&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_version.h (original)
+++ httpd/httpd/trunk/modules/md/md_version.h Fri Apr 22 08:45:31 2022
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "2.4.12"
+#define MOD_MD_VERSION "2.4.13"
 
 /**
  * @macro
@@ -35,7 +35,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_MD_VERSION_NUM 0x02040c
+#define MOD_MD_VERSION_NUM 0x02040d
 
 #define MD_ACME_DEF_URL    "https://acme-v02.api.letsencrypt.org/directory"