c75c21eef6
- Fixes CVE-2017-18926 and CVE-2020-25713. - drop 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1: merged upstream - drop 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1: merged upstream - drop libtool.patch: merged upstream - drop most of raptor-freebsd.patch.1: merged upstream - drop most of raptor-msvc.patch.1: merged upsttream - drop most of ubsan.patch: merged upstream - drop Wint-conversion.patch: merged upstream depend on package icu_ure to have libicuuc delivered and add corresponding directory to rpath-link to make sure the right copy is picked up use $(strip ...) in LDFLAGS to avoid having to escape , with $(COMMA) Change-Id: Ic05269ade5dae3761d98432ee504a51434a4c753 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161704 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
11 lines
319 B
Diff
11 lines
319 B
Diff
--- src/raptor_rfc2396.c
|
|
+++ src/raptor_rfc2396.c
|
|
@@ -386,7 +386,7 @@
|
|
}
|
|
|
|
|
|
- if(prev && s == (cur+2) && cur[0] == '.' && cur[1] == '.') {
|
|
+ if(prev && cur && s == (cur+2) && cur[0] == '.' && cur[1] == '.') {
|
|
/* Remove <component>/.. at the end of the path */
|
|
*prev = '\0';
|
|
path_len -= (s-prev);
|