github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3069 from owasp-modsecurity/revert-2957-v2/mst/yajl_compat

Browse Source 
Revert "Compatibility with libyajl decoding the buffer inline"
This commit is contained in:
Ervin Hegedus 2024-02-07 23:08:54 +01:00 committed by GitHub
commit feea267c79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache2/msc_json.c
View File

@ -354,17 +354,15 @@ int json_init(modsec_rec *msr, char **error_msg) {
int json_process_chunk(modsec_rec *msr, const char *buf, unsigned int size, char **error_msg) { int json_process_chunk(modsec_rec *msr, const char *buf, unsigned int size, char **error_msg) {
if (error_msg == NULL) return -1; if (error_msg == NULL) return -1;
*error_msg = NULL; *error_msg = NULL;
// Take a copy in case libyajl decodes the buffer inline base_offset=buf;
base_offset = apr_pstrmemdup(msr->mp, buf, size);
if (!base_offset) return -1;
/* Feed our parser and catch any errors */ /* Feed our parser and catch any errors */
msr->json->status = yajl_parse(msr->json->handle, (unsigned char*)base_offset, size); msr->json->status = yajl_parse(msr->json->handle, buf, size);
if (msr->json->status != yajl_status_ok) { if (msr->json->status != yajl_status_ok) {
if (msr->json->depth_limit_exceeded) { if (msr->json->depth_limit_exceeded) {
*error_msg = "JSON depth limit exceeded"; *error_msg = "JSON depth limit exceeded";
} else { } else {
char *yajl_err = yajl_get_error(msr->json->handle, 0, base_offset, size); char *yajl_err = yajl_get_error(msr->json->handle, 0, buf, size);
*error_msg = apr_pstrdup(msr->mp, yajl_err); *error_msg = apr_pstrdup(msr->mp, yajl_err);
yajl_free_error(msr->json->handle, yajl_err); yajl_free_error(msr->json->handle, yajl_err);
} }