36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
--- raptor2-2.0.15/src/raptor_rfc2396.c.CVE-2024-57823 2014-07-26 23:07:37.000000000 +0200
|
|
+++ raptor2-2.0.15/src/raptor_rfc2396.c 2025-01-13 12:59:22.175568228 +0100
|
|
@@ -289,10 +289,8 @@ raptor_uri_normalize_path(unsigned char*
|
|
}
|
|
|
|
|
|
-#if defined(RAPTOR_DEBUG)
|
|
if(path_len != strlen((const char*)path_buffer))
|
|
RAPTOR_FATAL4("Path '%s' length %ld does not match calculated %ld.", (const char*)path_buffer, (long)strlen((const char*)path_buffer), (long)path_len);
|
|
-#endif
|
|
|
|
/* Remove all "<component>/../" path components */
|
|
|
|
@@ -327,10 +325,8 @@ raptor_uri_normalize_path(unsigned char*
|
|
if(!prev || !cur)
|
|
continue;
|
|
|
|
-#if defined(RAPTOR_DEBUG)
|
|
if(path_len != strlen((const char*)path_buffer))
|
|
RAPTOR_FATAL3("Path length %ld does not match calculated %ld.", (long)strlen((const char*)path_buffer), (long)path_len);
|
|
-#endif
|
|
|
|
/* If the current one is '..' */
|
|
if(s == (cur+2) && cur[0] == '.' && cur[1] == '.') {
|
|
@@ -393,10 +389,8 @@ raptor_uri_normalize_path(unsigned char*
|
|
}
|
|
|
|
|
|
-#if defined(RAPTOR_DEBUG)
|
|
if(path_len != strlen((const char*)path_buffer))
|
|
RAPTOR_FATAL3("Path length %ld does not match calculated %ld.", (long)strlen((const char*)path_buffer), (long)path_len);
|
|
-#endif
|
|
|
|
/* RFC3986 Appendix C.2 / 5.4.2 Abnormal Examples
|
|
* Remove leading /../ and /./
|