[FIX] Fix potential double-free issue in Cytoplasm

Required by Telodendria/Telodendria#44.

Reviewed-on: Telodendria/Cytoplasm#19
Co-authored-by: lda <lda@freetards.xyz>
Co-committed-by: lda <lda@freetards.xyz>

CHANGELOG.md

@@ -1,29 +1,30 @@
-# Cytoplasm Change Log
+# Cytoplasm Change Log
-
+
-This document contains the complete change log for every official release of
+This document contains the complete change log for every official release of
-Cytoplasm. It is intended to be updated with every commit that makes a user-facing
+Cytoplasm. It is intended to be updated with every commit that makes a user-facing
-change worth reporting in the change log. As such, it changes frequently between
+change worth reporting in the change log. As such, it changes frequently between
-releases. Final change log entries are published as [Releases](releases).
+releases. Final change log entries are published as [Releases](releases).
-
+
-## v0.4.1
+## v0.4.1
-
+
-### New Features
+### New Features
-
+
-- Added an option to `j2s` to allow additional fields in structures and ignore them in
+- Added an option to `j2s` to allow additional fields in structures and ignore them in
-encoding and decoding. Note that additional fields are totally untouched—they
+encoding and decoding. Note that additional fields are totally untouched—they
-are not even initialized to a default value.
+are not even initialized to a default value.
-- Fixed a memory leak that would occur in code generated by `j2s` under
+- Fixed a memory leak that would occur in code generated by `j2s` under
-  specific circumstances.
+  specific circumstances.
-- Added `JsonMerge()` to the JSON API to merge two JSON objects together.
+- Added `JsonMerge()` to the JSON API to merge two JSON objects together.
-
+- Make `HttpRouter` decode path parts before matching them on regular expressions.
-## v0.4.0
+
-
+## v0.4.0
-**Released on November 1, 2023**
+
-
+**Released on November 1, 2023**
-This is the first independent release of Cytoplasm! Last month, Cytoplasm was
+
-split off of [Telodendria](/Telodendria/Telodendria) to become its own independent
+This is the first independent release of Cytoplasm! Last month, Cytoplasm was
-project with its own independent releases. This allows it to develop at a much more
+split off of [Telodendria](/Telodendria/Telodendria) to become its own independent
-rapid pace than Telodendria.
+project with its own independent releases. This allows it to develop at a much more
-
+rapid pace than Telodendria.
-Changes in future releases will be reported here. Since this is the first release,
+
+Changes in future releases will be reported here. Since this is the first release,
 there are no changes to show.

src/HttpRouter.c

@@ -23,6 +23,7 @@
  */
 #include <HttpRouter.h>
 
+#include <Http.h>
 #include <Memory.h>
 #include <HashMap.h>
 #include <Str.h>
@@ -228,6 +229,8 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
 
             regmatch_t pmatch[REG_MAX_SUB];
 
+            pathPart = HttpUrlDecode(pathPart);
+
             i = 0;
 
             while (HashMapIterateReentrant(node->children, &key, (void **) &val, &i))
@@ -243,6 +246,7 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
             if (!val)
             {
                 exec = NULL;
+                Free(pathPart);
                 break;
             }
 
@@ -263,12 +267,14 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
                     substr = StrSubstr(pathPart, cpmatch.rm_so, cpmatch.rm_eo);
                     if (pmatch[i].rm_so == -1)
                     {
+                        Free(pathPart);
                         break;
                     }
 
                     ArrayAdd(matches, substr);
                 }
             }
+            Free(pathPart);
         }
         Free(path);
     }