From 372b678e563680bd86207777ae293a40624ec962 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 24 Jan 2020 12:45:04 +0100 Subject: [PATCH 1/2] Yet another check for php_strip_tags_ex() --- ext/standard/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index f443519a729..38180106d54 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5266,7 +5266,7 @@ state_2: break; case '"': case '\'': - if (*(p-1) != '\\') { + if (p >= buf + 1 && *(p-1) != '\\') { if (lc == c) { lc = '\0'; } else if (lc != '\\') { From 49cbd23155d5c2ab72cc371b6fefa39bc8105b1a Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 24 Jan 2020 10:18:01 +0100 Subject: [PATCH 2/2] Make test independent of online XSD schema The test still needs to access , but at least we no longer depend on , which may be moved again. --- ext/soap/tests/bugs/bug76348.wsdl | 2 +- ext/soap/tests/bugs/bug76348.xsd | 641 ++++++++++++++++++++++++++++++ 2 files changed, 642 insertions(+), 1 deletion(-) create mode 100644 ext/soap/tests/bugs/bug76348.xsd diff --git a/ext/soap/tests/bugs/bug76348.wsdl b/ext/soap/tests/bugs/bug76348.wsdl index 43628b63b54..58780dc9511 100644 --- a/ext/soap/tests/bugs/bug76348.wsdl +++ b/ext/soap/tests/bugs/bug76348.wsdl @@ -7,7 +7,7 @@ targetNamespace="http://example.x-road.eu/producer/"> - + diff --git a/ext/soap/tests/bugs/bug76348.xsd b/ext/soap/tests/bugs/bug76348.xsd new file mode 100644 index 00000000000..cd5ef4b7803 --- /dev/null +++ b/ext/soap/tests/bugs/bug76348.xsd @@ -0,0 +1,641 @@ + + + + + + + + + + + + + + + + + + + Service consumer code + + + + + Service producer code + + + + + Service user identification code with country code prefix (2-characters) + + + + + Query id + + + + + Query name + + + + + Query issue + + + + + Service user's unit code + + + + + Service user postition name + + + + + Service user's authenticator + + + + + Service user full name + + + + + Asynchroneous service flag + + + + + Name of encoder-db + + + + + + Title + + + + + + + + + + + + Notes for user + + + + + + + + + + + + Notes for technical stuff + + + + + + + + + + + + The element name of the element is associated + + + + + List of permitted wildcards + + + + + + + + + + Version + + + + + + + + + + Meaning of empty fields + + + + + Meaning of empty fields + + + + + Port address + + + + + + + + + + + Infosüsteemi sissepääsu URL + URL for entering external portal + + + + + + + + + + + + Kood + Code + + + + + + + Teade + Error message + + + + + + + + + + Pilt (JPEG) + JPEG picture + + + + + + + + Pilt (GIF) + GIF picture + + + + + + + + XMLina kasutatav tekst + Text as XML + + + + + + + + Tekstifail + Text file + + + + + + + + CSV-vormingus fail + CSV file + + + + + + + + Maakond + County + County code in Estonian Administrative and Settlement Classification (EHAK) + + + + + + + + + + Vald + Parish + Parish code in Estonian Administrative and Settlement Classification (EHAK) + + + + + + + + + + Asula + Village + Village code in Estonian Administrative and Settlement Classification (EHAK) + + + + + + + + + + Haldusüksus + Unit + Unit code in Estonian Administrative and Settlement Classification (EHAK). Could be County, Parish or Village + + + + + + + + + + Link + Link + WWW URL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Üksuse kood + Unit code + + + + + + + + + + + + + + + + + + + + + + + + Kas üksus kehtib + Is unit valid at the moment + + + + + + + Üksuse nimi + Unit name + + + + + + + + + + + + + + + + + + Isikukood + Person SSN + + + + + + + + + + + + + + + + + + + + + + + + + + + Üksuse kood + Unit code + + + + + + + Üksuse nimi + Unit name + + + + + + + + + + + + + + + + + + + + + + Nimi + Name + + + + + + + Alamhulk + Subset + + + + + + + Alates + From + + + + + + + Maksimaalne arv + Max count + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Nimi + Name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Isikukood + Person SSN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Isikukood + Person identification code + + + + + + + + + + Asutuse kood + Organization code + + + + + + + Asutuse nimi + Organization name + + + + + + + + + + Päringu nimi + Query name + + + + + + + Kehtib kuupäevani + Permission valid until date + + + + + + + + + + + + + + + + + + + + + + + + + Kood + Code + + + + + + + + Teade + Error message + + + + +