forked from Telodendria/Cytoplasm
Compare commits
3 commits
29070c8f41
...
3788d044e6
Author | SHA1 | Date | |
---|---|---|---|
3788d044e6 | |||
928e9c8223 | |||
17f1a41519 |
2 changed files with 35 additions and 28 deletions
|
@ -15,6 +15,7 @@ are not even initialized to a default value.
|
|||
- Fixed a memory leak that would occur in code generated by `j2s` under
|
||||
specific circumstances.
|
||||
- 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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue