Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [INTL] Translate hardcoded string (#2654)
by Kyle Katarn 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=216b702fb691a18cc60be… commit 216b702fb691a18cc60bedd2867c1085be2912bf Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Apr 24 16:27:07 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 24 17:27:07 2020 +0300 [INTL] Translate hardcoded string (#2654) CORE-16951 --- dll/cpl/intl/advanced.c | 3 +-- dll/cpl/intl/lang/bg-BG.rc | 2 +- dll/cpl/intl/lang/cs-CZ.rc | 1 + dll/cpl/intl/lang/de-DE.rc | 1 + dll/cpl/intl/lang/en-US.rc | 1 + dll/cpl/intl/lang/es-ES.rc | 2 +- dll/cpl/intl/lang/fr-FR.rc | 2 +- dll/cpl/intl/lang/he-IL.rc | 2 +- dll/cpl/intl/lang/id-ID.rc | 1 + dll/cpl/intl/lang/it-IT.rc | 2 +- dll/cpl/intl/lang/ja-JP.rc | 1 + dll/cpl/intl/lang/no-NO.rc | 2 +- dll/cpl/intl/lang/pl-PL.rc | 1 + dll/cpl/intl/lang/pt-BR.rc | 1 + dll/cpl/intl/lang/pt-PT.rc | 2 +- dll/cpl/intl/lang/ro-RO.rc | 1 + dll/cpl/intl/lang/ru-RU.rc | 1 + dll/cpl/intl/lang/sk-SK.rc | 2 +- dll/cpl/intl/lang/sq-AL.rc | 1 + dll/cpl/intl/lang/tr-TR.rc | 1 + dll/cpl/intl/lang/uk-UA.rc | 1 + dll/cpl/intl/lang/zh-CN.rc | 2 +- dll/cpl/intl/lang/zh-TW.rc | 2 +- dll/cpl/intl/resource.h | 2 +- 24 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dll/cpl/intl/advanced.c b/dll/cpl/intl/advanced.c index dd42d3fc70e..ddd1c09e901 100644 --- a/dll/cpl/intl/advanced.c +++ b/dll/cpl/intl/advanced.c @@ -316,8 +316,7 @@ SaveFontSubstitutionSettings( if (!SetupInstallFromInfSectionW(hwnd, hFontInf, szSection, SPINST_REGISTRY & ~SPINST_FILES, NULL, NULL, 0, NULL, NULL, NULL, NULL)) { - MessageBoxW(hwnd, L"Unable to install a new language for programs don't support unicode!", - NULL, MB_ICONERROR | MB_OK); + PrintErrorMsgBox(IDS_ERROR_UNICODE); } SetupCloseInfFile(hFontInf); diff --git a/dll/cpl/intl/lang/bg-BG.rc b/dll/cpl/intl/lang/bg-BG.rc index c5c278d9e58..b375bb57e8e 100644 --- a/dll/cpl/intl/lang/bg-BG.rc +++ b/dll/cpl/intl/lang/bg-BG.rc @@ -213,5 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/cs-CZ.rc b/dll/cpl/intl/lang/cs-CZ.rc index df203eecfea..4d3c826742c 100644 --- a/dll/cpl/intl/lang/cs-CZ.rc +++ b/dll/cpl/intl/lang/cs-CZ.rc @@ -218,4 +218,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problém při otevírání klíče: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problém při otevírání klíče: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Nebylo možné spustit input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/de-DE.rc b/dll/cpl/intl/lang/de-DE.rc index 5cae8fd0375..16471f8b08a 100644 --- a/dll/cpl/intl/lang/de-DE.rc +++ b/dll/cpl/intl/lang/de-DE.rc @@ -214,4 +214,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Der Schlüssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language konnte nicht geöffnet werden." IDS_ERROR_NLS_CODE_REG "Der Schlüssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage konnte nicht geöffnet werden." IDS_ERROR_INPUT_DLL "Die Datei input.dll konnte nicht geladen werden." + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/en-US.rc b/dll/cpl/intl/lang/en-US.rc index 3951b3e6705..62b2bd1b315 100644 --- a/dll/cpl/intl/lang/en-US.rc +++ b/dll/cpl/intl/lang/en-US.rc @@ -213,4 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/es-ES.rc b/dll/cpl/intl/lang/es-ES.rc index 7433a7bcf13..0d19b4dc4e1 100644 --- a/dll/cpl/intl/lang/es-ES.rc +++ b/dll/cpl/intl/lang/es-ES.rc @@ -215,5 +215,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Hubo un problema al abrir la clave del Registro: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Hubo un problema al abrir la clave del Registro: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "No se pudo iniciar input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/fr-FR.rc b/dll/cpl/intl/lang/fr-FR.rc index bd29574e6a8..1a7ba32b359 100644 --- a/dll/cpl/intl/lang/fr-FR.rc +++ b/dll/cpl/intl/lang/fr-FR.rc @@ -215,5 +215,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Impossible d'installer une nouvelle langue pour les programmes ne supportant pas l'unicode!" END - diff --git a/dll/cpl/intl/lang/he-IL.rc b/dll/cpl/intl/lang/he-IL.rc index a62ae834423..381925a9224 100644 --- a/dll/cpl/intl/lang/he-IL.rc +++ b/dll/cpl/intl/lang/he-IL.rc @@ -215,5 +215,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/id-ID.rc b/dll/cpl/intl/lang/id-ID.rc index 300d42407a6..5d2ff8fcf67 100644 --- a/dll/cpl/intl/lang/id-ID.rc +++ b/dll/cpl/intl/lang/id-ID.rc @@ -213,4 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Masalah membuka kunci: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Masalah membuka kunci: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Tidak bisa memulai input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/it-IT.rc b/dll/cpl/intl/lang/it-IT.rc index 2d29c423bd0..9547adb4da5 100644 --- a/dll/cpl/intl/lang/it-IT.rc +++ b/dll/cpl/intl/lang/it-IT.rc @@ -216,5 +216,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/ja-JP.rc b/dll/cpl/intl/lang/ja-JP.rc index 83e27d5d355..8fdfe5c041b 100644 --- a/dll/cpl/intl/lang/ja-JP.rc +++ b/dll/cpl/intl/lang/ja-JP.rc @@ -213,4 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "input.dllを開始できません" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/no-NO.rc b/dll/cpl/intl/lang/no-NO.rc index 0e67330ed07..b9fc4345795 100644 --- a/dll/cpl/intl/lang/no-NO.rc +++ b/dll/cpl/intl/lang/no-NO.rc @@ -213,5 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/pl-PL.rc b/dll/cpl/intl/lang/pl-PL.rc index e0badd936da..4d5a832b97d 100644 --- a/dll/cpl/intl/lang/pl-PL.rc +++ b/dll/cpl/intl/lang/pl-PL.rc @@ -221,4 +221,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem z otwarciem klucza: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem z otwarciem klucza: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Nie można uruchomić input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/pt-BR.rc b/dll/cpl/intl/lang/pt-BR.rc index 585a56d1241..de56be8c0f2 100644 --- a/dll/cpl/intl/lang/pt-BR.rc +++ b/dll/cpl/intl/lang/pt-BR.rc @@ -210,4 +210,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Não foi possível iniciar input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index 493602fbef8..45db38c36d0 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -210,5 +210,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Erro ao abrir a chave: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Não foi possível iniciar input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/ro-RO.rc b/dll/cpl/intl/lang/ro-RO.rc index dfc73f1c917..0012f907156 100644 --- a/dll/cpl/intl/lang/ro-RO.rc +++ b/dll/cpl/intl/lang/ro-RO.rc @@ -215,4 +215,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problemă la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" IDS_ERROR_NLS_CODE_REG "Problemă la deschiderea cheii: HKU\\.DEFAULT\\Control Panel\\International" IDS_ERROR_INPUT_DLL "„input.dll” nu a putut fi încărcat!" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/ru-RU.rc b/dll/cpl/intl/lang/ru-RU.rc index 67b7f8cc989..194888c267e 100644 --- a/dll/cpl/intl/lang/ru-RU.rc +++ b/dll/cpl/intl/lang/ru-RU.rc @@ -214,4 +214,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Проблема открытия ключа: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Проблема открытия ключа: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Не удается запустить input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/sk-SK.rc b/dll/cpl/intl/lang/sk-SK.rc index c200c3b37bc..60d425d827f 100644 --- a/dll/cpl/intl/lang/sk-SK.rc +++ b/dll/cpl/intl/lang/sk-SK.rc @@ -219,5 +219,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/sq-AL.rc b/dll/cpl/intl/lang/sq-AL.rc index b36cdb56a19..32bb02ac14c 100644 --- a/dll/cpl/intl/lang/sq-AL.rc +++ b/dll/cpl/intl/lang/sq-AL.rc @@ -217,4 +217,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/tr-TR.rc b/dll/cpl/intl/lang/tr-TR.rc index fc2e4e4ff2d..e879b988923 100644 --- a/dll/cpl/intl/lang/tr-TR.rc +++ b/dll/cpl/intl/lang/tr-TR.rc @@ -215,4 +215,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "HKU\\.DEFAULT\\Control Panel\\International dizinini açmada bir sorun oldu." IDS_ERROR_NLS_CODE_REG "HKU\\.DEFAULT\\Control Panel\\International dizinini açmada bir sorun oldu." IDS_ERROR_INPUT_DLL "input.dll başlatılamaz." + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/uk-UA.rc b/dll/cpl/intl/lang/uk-UA.rc index 80ef1a76215..6ef54af377c 100644 --- a/dll/cpl/intl/lang/uk-UA.rc +++ b/dll/cpl/intl/lang/uk-UA.rc @@ -221,4 +221,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "Unable to start input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END diff --git a/dll/cpl/intl/lang/zh-CN.rc b/dll/cpl/intl/lang/zh-CN.rc index bec6d875d60..51023a58c55 100644 --- a/dll/cpl/intl/lang/zh-CN.rc +++ b/dll/cpl/intl/lang/zh-CN.rc @@ -218,5 +218,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "问题打开项: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "问题打开项: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "无法启动 input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/lang/zh-TW.rc b/dll/cpl/intl/lang/zh-TW.rc index 0a96176b13f..029476928f7 100644 --- a/dll/cpl/intl/lang/zh-TW.rc +++ b/dll/cpl/intl/lang/zh-TW.rc @@ -218,5 +218,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "問題開啟項: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "問題開啟項: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "無法啟動 input.dll" + IDS_ERROR_UNICODE "Unable to install a new language for programs don't support unicode!" END - diff --git a/dll/cpl/intl/resource.h b/dll/cpl/intl/resource.h index 2e5b759726e..554ab02d2a2 100644 --- a/dll/cpl/intl/resource.h +++ b/dll/cpl/intl/resource.h @@ -88,7 +88,7 @@ #define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014 #define IDS_ERROR_SYMBOL_FORMAT_LONG 1015 #define IDS_ERROR_INPUT_DLL 1016 - +#define IDS_ERROR_UNICODE 1017 #define IDS_APPLY_DEFAULT_TITLE 1100 #define IDS_APPLY_DEFAULT_TEXT 1101

1 0

[reactos] 01/01: [WINDOWSCODECS] Use upstream Wine fix for 4bps BGRA TIFF. CORE-16796
by Thomas Faber 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e9c4dad6627078cb1bb3… commit 3e9c4dad6627078cb1bb36d077a5b20676c51d4b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Apr 24 14:56:26 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Apr 24 14:56:26 2020 +0200 [WINDOWSCODECS] Use upstream Wine fix for 4bps BGRA TIFF. CORE-16796 Import Wine commits by Dmitry Timoshkov: * 0cd8502b49 windowscodecs: Add support for 4bps RGBA format to TIFF decoder. * 962bb99352 windowscodecs/tests: Add a separate test for 4bps BGRA TIFF format. --- dll/win32/windowscodecs/tiffformat.c | 60 ++++++------ .../rostests/winetests/windowscodecs/tiffformat.c | 104 +++++++++++++++++++++ 2 files changed, 132 insertions(+), 32 deletions(-) diff --git a/dll/win32/windowscodecs/tiffformat.c b/dll/win32/windowscodecs/tiffformat.c index e7141fc3e23..b3d32eec611 100644 --- a/dll/win32/windowscodecs/tiffformat.c +++ b/dll/win32/windowscodecs/tiffformat.c @@ -1148,48 +1148,44 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } - /* 4bpp RGBA */ + /* 4bps RGBA */ else if (This->decode_info.source_bpp == 4 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) { - BYTE *src, *dst; - DWORD count; + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 3 + 7) / 8; - /* 1 source byte expands to 2 BGRA samples */ - count = (This->decode_info.tile_width * This->decode_info.tile_height + 1) / 2; + count = width_bytes * This->decode_info.tile_height; - src = This->cached_tile + count - 1; - dst = This->cached_tile + This->decode_info.tile_size; + srcdata = HeapAlloc(GetProcessHeap(), 0, count); + if (!srcdata) return E_OUTOFMEMORY; + memcpy(srcdata, This->cached_tile, count); - while (count--) + for (y = 0; y < This->decode_info.tile_height; y++) { - BYTE b = *src--; + src = srcdata + y * width_bytes; + dst = This->cached_tile + y * This->decode_info.tile_width * 4; -#ifdef __REACTOS__ - dst -= 4; - dst[2] = (b & 0x08) ? 0xff : 0; /* R */ - dst[1] = (b & 0x04) ? 0xff : 0; /* G */ - dst[0] = (b & 0x02) ? 0xff : 0; /* B */ - dst[3] = (b & 0x01) ? 0xff : 0; /* A */ - if (count || This->decode_info.tile_width % 2 == 0) + /* 1 source byte expands to 2 BGRA samples */ + + for (x = 0; x < This->decode_info.tile_width; x += 2) { - dst -= 4; - dst[2] = (b & 0x80) ? 0xff : 0; /* R */ - dst[1] = (b & 0x40) ? 0xff : 0; /* G */ - dst[0] = (b & 0x20) ? 0xff : 0; /* B */ - dst[3] = (b & 0x10) ? 0xff : 0; /* A */ + dst[0] = (src[0] & 0x20) ? 0xff : 0; /* B */ + dst[1] = (src[0] & 0x40) ? 0xff : 0; /* G */ + dst[2] = (src[0] & 0x80) ? 0xff : 0; /* R */ + dst[3] = (src[0] & 0x10) ? 0xff : 0; /* A */ + if (x + 1 < This->decode_info.tile_width) + { + dst[4] = (src[0] & 0x02) ? 0xff : 0; /* B */ + dst[5] = (src[0] & 0x04) ? 0xff : 0; /* G */ + dst[6] = (src[0] & 0x08) ? 0xff : 0; /* R */ + dst[7] = (src[0] & 0x01) ? 0xff : 0; /* A */ + } + src++; + dst += 8; } -#else - dst -= 8; - dst[2] = (b & 0x80) ? 0xff : 0; /* R */ - dst[1] = (b & 0x40) ? 0xff : 0; /* G */ - dst[0] = (b & 0x20) ? 0xff : 0; /* B */ - dst[3] = (b & 0x10) ? 0xff : 0; /* A */ - dst[6] = (b & 0x08) ? 0xff : 0; /* R */ - dst[5] = (b & 0x04) ? 0xff : 0; /* G */ - dst[4] = (b & 0x02) ? 0xff : 0; /* B */ - dst[7] = (b & 0x01) ? 0xff : 0; /* A */ -#endif } + + HeapFree(GetProcessHeap(), 0, srcdata); } /* 16bpp RGBA */ else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) diff --git a/modules/rostests/winetests/windowscodecs/tiffformat.c b/modules/rostests/winetests/windowscodecs/tiffformat.c index 8cdc0047a21..0c68904abad 100644 --- a/modules/rostests/winetests/windowscodecs/tiffformat.c +++ b/modules/rostests/winetests/windowscodecs/tiffformat.c @@ -302,6 +302,47 @@ static const struct tiff_24bpp_data { 900, 3 }, { 0x11, 0x22, 0x33 } }; + +static const struct tiff_4bps_bgra +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[4]; +} tiff_4bps_bgra = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_4bps_bgra, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 3 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_4bps_bgra, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 4 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 4 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* YRESOLUTION */ + { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ + { 0x128, IFD_SHORT, 1, 2 } /* RESOLUTIONUNIT */ + }, + 0, + { 96, 1 }, + { 0x12,0x30, 0x47,0xe0 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -1179,6 +1220,68 @@ static void test_color_formats(void) } } +static void test_tiff_4bps_bgra(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT frame_count, width, height, i; + double dpi_x, dpi_y; + IWICPalette *palette; + GUID format; + WICRect rc; + BYTE data[24]; + static const BYTE expected_data[24] = { 0,0,0,0xff, 0xff,0,0,0, 0xff,0,0,0xff, + 0,0xff,0,0, 0xff,0xff,0,0xff, 0xff,0xff,0xff,0 }; + + hr = create_decoder(&tiff_4bps_bgra, sizeof(tiff_4bps_bgra), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 3, "got %u\n", width); + ok(height == 2, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x); + ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, + "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr); + IWICPalette_Release(palette); + + memset(data, 0xaa, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 3; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 12, sizeof(data), data); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + + for (i = 0; i < sizeof(data); i++) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -1190,6 +1293,7 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; + test_tiff_4bps_bgra(); test_color_formats(); test_tiff_1bpp_palette(); test_tiff_8bpp_palette();

1 0

[reactos] 02/02: [LIBXSLT] Update to version 1.1.34. CORE-16952
by Thomas Faber 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b01a4801638c7941eeb58… commit b01a4801638c7941eeb58d1cdf331ffb204bf305 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Apr 24 09:25:23 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Apr 24 14:45:03 2020 +0200 [LIBXSLT] Update to version 1.1.34. CORE-16952 --- dll/3rdparty/libxslt/Makefile.am | 1 - dll/3rdparty/libxslt/NEWS | 147 +++++++++++++- dll/3rdparty/libxslt/attrvt.c | 23 ++- dll/3rdparty/libxslt/documents.c | 18 +- dll/3rdparty/libxslt/functions.c | 2 +- dll/3rdparty/libxslt/imports.c | 9 +- dll/3rdparty/libxslt/keys.c | 17 +- dll/3rdparty/libxslt/numbers.c | 109 ++++++---- dll/3rdparty/libxslt/pattern.c | 73 ++++--- dll/3rdparty/libxslt/security.c | 18 +- dll/3rdparty/libxslt/templates.c | 134 +++++++------ dll/3rdparty/libxslt/transform.c | 71 +++++-- dll/3rdparty/libxslt/variables.c | 16 +- dll/3rdparty/libxslt/xslt.c | 240 ++++++++++++----------- dll/3rdparty/libxslt/xsltconfig.h.in | 16 +- dll/3rdparty/libxslt/xsltutils.c | 76 ++++--- dll/3rdparty/libxslt/xsltwin32config.h | 6 +- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libxslt/pattern.h | 3 + sdk/include/reactos/libs/libxslt/xsltInternals.h | 22 +-- sdk/include/reactos/libs/libxslt/xsltconfig.h | 22 ++- sdk/include/reactos/libs/libxslt/xsltutils.h | 2 +- 22 files changed, 655 insertions(+), 372 deletions(-) diff --git a/dll/3rdparty/libxslt/Makefile.am b/dll/3rdparty/libxslt/Makefile.am index ef2de24e2ef..22dbdefac47 100644 --- a/dll/3rdparty/libxslt/Makefile.am +++ b/dll/3rdparty/libxslt/Makefile.am @@ -64,7 +64,6 @@ endif libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) libxslt_la_LDFLAGS = \ - $(WIN32_EXTRA_LDFLAGS) \ $(LIBXSLT_VERSION_SCRIPT) \ -version-info $(LIBXSLT_VERSION_INFO) diff --git a/dll/3rdparty/libxslt/NEWS b/dll/3rdparty/libxslt/NEWS index f3b05965ff3..7200cd33f8e 100644 --- a/dll/3rdparty/libxslt/NEWS +++ b/dll/3rdparty/libxslt/NEWS @@ -5,9 +5,154 @@ http://xmlsoft.org/XSLT/news.html See the git page at -http://git.gnome.org/browse/libxslt/ +https://gitlab.gnome.org/GNOME/libxslt to get a description of the recent commits.Those are the public releases made: +v1.1.33: Jan 03 2019: + - Portability: + Variables need 'extern' in static lib on Cygwin (Nick Wellnhofer), + Really declare dllexport/dllimport for Cygwin (Michael Haubenwallner), + Fix callback signatures in Python bindings (Nick Wellnhofer), + Fix transform callback signatures (Nick Wellnhofer), + Fix extension callback signatures (Nick Wellnhofer), + Fix deallocator signatures (Nick Wellnhofer), + Fix XPath callback signatures (Nick Wellnhofer), + Fix hash callback signatures (Nick Wellnhofer) + + - Bug Fixes: + Don't cache direct evaluation of patterns with variables (Nick Wellnhofer), + Move function result RVTs to context variable (Nick Wellnhofer), + Fix EXSLT functions returning RVTs from outer scopes (Nick Wellnhofer), + Fix handling of RVTs returned from nested EXSLT functions (Nick Wellnhofer), + Fix typos (Nick Wellnhofer) + + - Improvements: + Run Travis ASan tests with "sudo: required" (Nick Wellnhofer) + + - Cleanups: + Remove doc/libxslt-decl.txt (Nick Wellnhofer), + Docs for 1.1.32 release (Daniel Veillard) + + + +1.1.32: Nov 02 2017: + - Portability: + Add missing limits.h include (Nick Wellnhofer), + Also run Windows tests with --maxdepth 200 (Nick Wellnhofer), + Disable some MSVC warnings (Nick Wellnhofer), + Fix deprecated Travis compiler flag (Nick Wellnhofer), + Run general tests with maxdepth=200 (Nick Wellnhofer), + Use _WIN32 macro instead of WIN32 (Nick Wellnhofer), + Fix xsltproc newlines on Windows (Nick Wellnhofer), + Fix Windows compiler warnings (Nick Wellnhofer), + Rework locale feature tests (Nick Wellnhofer) + + - Improvements: + Rebuild win32/libxslt.def.src (Nick Wellnhofer), + Fix compiler warnings in Python bindings (Nick Wellnhofer) + + + +v1.1.31: Oct 06 2017: + - Portability: + Fix win32/configure.js (Nick Wellnhofer) + + - Bug Fixes: + Fix pkg-config related regressions in configure script (Nick Wellnhofer) + + - Improvements: + Adjust expected error output for libxml2 changes (Nick Wellnhofer), + Misc autoconf updates (Nick Wellnhofer) + + + +v1.1.30: Sep 04 2017: + - Documentation: + Misc doc fixes (Nick Wellnhofer) + + - Portability: + Look for libxml2 via pkg-config first (Elliott Sales de Andrade), + Change default SOPREFIX on Windows to "bin" (Nick Wellnhofer), + Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am (Michael Haubenwallner) + + - Bug Fixes: + Also fix memory hazards in exsltFuncResultElem (Nick Wellnhofer), + Fix NULL deref in xsltDefaultSortFunction (Nick Wellnhofer), + Fix memory hazards in exsltFuncFunctionFunction (Nick Wellnhofer), + Fix memory leaks in EXSLT error paths (Nick Wellnhofer), + Fix memory leak in str:concat with empty node-set (Nick Wellnhofer), + Fix memory leaks in error paths (Nick Wellnhofer), + Switch to xmlUTF8Strsize in numbers.c (Nick Wellnhofer), + Fix NULL pointer deref in xsltFormatNumberFunction (Nick Wellnhofer), + Fix UTF-8 check in str:padding (Nick Wellnhofer), + Fix xmlStrPrintf argument (Nick Wellnhofer), + Check for overflow in _exsltDateParseGYear (Nick Wellnhofer), + Fix double to int conversion (Nick Wellnhofer), + Check for overflow in exsltDateParseDuration (Nick Wellnhofer), + Change version of xsltMaxVars back to 1.0.24 (Nick Wellnhofer), + Disable xsltCopyTextString optimization for extensions (Nick Wellnhofer), + Create DOCTYPE for HTML version 5 (Nick Wellnhofer), + Make xsl:decimal-format work with namespaces (Nick Wellnhofer), + Remove norm:localTime extension function (Nick Wellnhofer), + Check for integer overflow in xsltAddTextString (Nick Wellnhofer), + Detect infinite recursion when evaluating function arguments (Nick Wellnhofer), + Fix memory leak in xsltElementAvailableFunction (Nick Wellnhofer), + Fix for pattern predicates calling functions (Nick Wellnhofer), + Fix cmd.exe invocations in Makefile.mingw (Nick Wellnhofer), + Don't try to install index.sgml (Nick Wellnhofer), + Fix symbols.xml (Nick Wellnhofer), + Fix heap overread in xsltFormatNumberConversion (Nick Wellnhofer), + Fix <xsl:number level="any"/> for non-element nodes (Nick Wellnhofer), + Fix unreachable code in xsltAddChild (mahendra.n), + Change version number in xsl:version warning (Nick Wellnhofer), + Avoid infinite recursion after failed param evaluation (Nick Wellnhofer), + Stop if potential recursion is detected (Nick Wellnhofer), + Consider built-in templates in apply-imports (Nick Wellnhofer), + Fix precedence with multiple attribute sets (Nick Wellnhofer), + Rework attribute set resolution (Nick Wellnhofer) + + - Improvements: + Add .travis.yml (Nick Wellnhofer), + Silence tests a little (Nick Wellnhofer), + Set LIBXML_SRC to absolute path (Nick Wellnhofer), + Add missing #include (Nick Wellnhofer), + Adjust expected error messages in tests (Nick Wellnhofer), + Make xsltDebug more quiet (Nick Wellnhofer), + New-line terminate error message that missed this convention (Jan Pokorn�), + Use xmlBuffers in EXSLT string functions (Nick Wellnhofer), + Switch to xmlUTF8Strsize in EXSLT string functions (Nick Wellnhofer), + Check for return value of xmlUTF8Strlen (Nick Wellnhofer), + Avoid double/long round trip in FORMAT_ITEM (Nick Wellnhofer), + Separate date and duration structs (Nick Wellnhofer), + Check for overflow in _exsltDateDifference (Nick Wellnhofer), + Clamp seconds field of durations (Nick Wellnhofer), + Change _exsltDateAddDurCalc parameter types (Nick Wellnhofer), + Fix date:difference with time zones (Nick Wellnhofer), + Rework division/remainder arithmetic in date.c (Nick Wellnhofer), + Remove exsltDateCastDateToNumber (Nick Wellnhofer), + Change internal representation of years (Nick Wellnhofer), + Optimize IS_LEAP (Nick Wellnhofer), + Link libraries with libm (Jussi Kukkonen), + Rename xsltCopyTreeInternal to xsltCopyTree (Nick Wellnhofer), + Update linker version script (Nick Wellnhofer), + Add local wildcard to version script (Nick Wellnhofer), + Make some symbols static (Nick Wellnhofer), + Remove redundant NULL check in xsltNumberComp (mahendra.n), + Fix forwards compatibility for imported stylesheets (Nick Wellnhofer), + Reduce warnings in forwards-compatible mode (Nick Wellnhofer), + Precompute XSLT elements after preprocessing (Nick Wellnhofer), + Fix whitespace in xsltParseStylesheetTop (Nick Wellnhofer), + Consolidate recursion checks (Nick Wellnhofer), + Treat XSLT_STATE_STOPPED same as errors (Nick Wellnhofer), + Make sure that XSLT_STATE_STOPPED isn't overwritten (Nick Wellnhofer), + Add comment regarding built-in templates and params (Nick Wellnhofer), + Rewrite memory management of local RVTs (Nick Wellnhofer), + Validate QNames of attribute sets (Nick Wellnhofer), + Add xsl:attribute-set regression tests (Nick Wellnhofer), + Ignore imported stylesheets in xsltApplyAttributeSet (Nick Wellnhofer) + + + 1.1.29: May 24 2016: - Security: CVE-2015-7995 Fix for type confusion in preprocessing attributes (Daniel Veillard) diff --git a/dll/3rdparty/libxslt/attrvt.c b/dll/3rdparty/libxslt/attrvt.c index a23b62a15f9..80927993153 100644 --- a/dll/3rdparty/libxslt/attrvt.c +++ b/dll/3rdparty/libxslt/attrvt.c @@ -36,7 +36,12 @@ struct _xsltAttrVT { /* * the content is an alternate of string and xmlXPathCompExprPtr */ - void *segments[MAX_AVT_SEG]; +#if __STDC_VERSION__ >= 199901L + /* Using a C99 flexible array member avoids false positives under UBSan */ + void *segments[]; +#else + void *segments[1]; +#endif }; /** @@ -50,15 +55,16 @@ struct _xsltAttrVT { static xsltAttrVTPtr xsltNewAttrVT(xsltStylesheetPtr style) { xsltAttrVTPtr cur; + size_t size = sizeof(xsltAttrVT) + MAX_AVT_SEG * sizeof(void*); - cur = (xsltAttrVTPtr) xmlMalloc(sizeof(xsltAttrVT)); + cur = (xsltAttrVTPtr) xmlMalloc(size); if (cur == NULL) { xsltTransformError(NULL, style, NULL, "xsltNewAttrVTPtr : malloc failed\n"); if (style != NULL) style->errors++; return(NULL); } - memset(cur, 0, sizeof(xsltAttrVT)); + memset(cur, 0, size); cur->nb_seg = 0; cur->max_seg = MAX_AVT_SEG; @@ -134,11 +140,14 @@ xsltFreeAVTList(void *avt) { static xsltAttrVTPtr xsltSetAttrVTsegment(xsltAttrVTPtr avt, void *val) { if (avt->nb_seg >= avt->max_seg) { - avt = (xsltAttrVTPtr) xmlRealloc(avt, sizeof(xsltAttrVT) + - avt->max_seg * sizeof(void *)); - if (avt == NULL) { + size_t size = sizeof(xsltAttrVT) + + (avt->max_seg + MAX_AVT_SEG) * sizeof(void *); + xsltAttrVTPtr tmp = (xsltAttrVTPtr) xmlRealloc(avt, size); + if (tmp == NULL) { + xsltFreeAttrVT(avt); return NULL; } + avt = tmp; memset(&avt->segments[avt->nb_seg], 0, MAX_AVT_SEG*sizeof(void *)); avt->max_seg += MAX_AVT_SEG; } @@ -152,7 +161,7 @@ xsltSetAttrVTsegment(xsltAttrVTPtr avt, void *val) { * @attr: the attribute coming from the stylesheet. * * Precompile an attribute in a stylesheet, basically it checks if it is - * an attrubute value template, and if yes establish some structures needed + * an attribute value template, and if yes, establish some structures needed * to process it at transformation time. */ void diff --git a/dll/3rdparty/libxslt/documents.c b/dll/3rdparty/libxslt/documents.c index 4f4bb5d76ae..b7afe3523fe 100644 --- a/dll/3rdparty/libxslt/documents.c +++ b/dll/3rdparty/libxslt/documents.c @@ -279,10 +279,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) { int res; res = xsltCheckRead(ctxt->sec, ctxt, URI); - if (res == 0) { - xsltTransformError(ctxt, NULL, NULL, - "xsltLoadDocument: read rights for %s denied\n", - URI); + if (res <= 0) { + if (res == 0) + xsltTransformError(ctxt, NULL, NULL, + "xsltLoadDocument: read rights for %s denied\n", + URI); return(NULL); } } @@ -355,10 +356,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) { int res; res = xsltCheckRead(sec, NULL, URI); - if (res == 0) { - xsltTransformError(NULL, NULL, NULL, - "xsltLoadStyleDocument: read rights for %s denied\n", - URI); + if (res <= 0) { + if (res == 0) + xsltTransformError(NULL, NULL, NULL, + "xsltLoadStyleDocument: read rights for %s denied\n", + URI); return(NULL); } } diff --git a/dll/3rdparty/libxslt/functions.c b/dll/3rdparty/libxslt/functions.c index 01ce96cad18..306044ce930 100644 --- a/dll/3rdparty/libxslt/functions.c +++ b/dll/3rdparty/libxslt/functions.c @@ -27,7 +27,7 @@ /** * xsltXPathFunctionLookup: - * @ctxt: a void * but the XSLT transformation context actually + * @vctxt: a void * but the XSLT transformation context actually * @name: the function name * @ns_uri: the function namespace URI * diff --git a/dll/3rdparty/libxslt/imports.c b/dll/3rdparty/libxslt/imports.c index b3ec6d73472..f67d5dfb3dd 100644 --- a/dll/3rdparty/libxslt/imports.c +++ b/dll/3rdparty/libxslt/imports.c @@ -93,10 +93,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) { int secres; secres = xsltCheckRead(sec, NULL, URI); - if (secres == 0) { - xsltTransformError(NULL, NULL, NULL, - "xsl:import: read rights for %s denied\n", - URI); + if (secres <= 0) { + if (secres == 0) + xsltTransformError(NULL, NULL, NULL, + "xsl:import: read rights for %s denied\n", + URI); goto error; } } diff --git a/dll/3rdparty/libxslt/keys.c b/dll/3rdparty/libxslt/keys.c index 357170b2380..4215cb38e85 100644 --- a/dll/3rdparty/libxslt/keys.c +++ b/dll/3rdparty/libxslt/keys.c @@ -223,6 +223,8 @@ skipString(const xmlChar *cur, int end) { */ static int skipPredicate(const xmlChar *cur, int end) { + int level = 0; + if ((cur == NULL) || (end < 0)) return(-1); if (cur[end] != '[') return(end); end++; @@ -233,12 +235,12 @@ skipPredicate(const xmlChar *cur, int end) { return(-1); continue; } else if (cur[end] == '[') { - end = skipPredicate(cur, end); - if (end <= 0) - return(-1); - continue; - } else if (cur[end] == ']') - return(end + 1); + level += 1; + } else if (cur[end] == ']') { + if (level == 0) + return(end + 1); + level -= 1; + } end++; } return(-1); @@ -611,6 +613,7 @@ xsltInitCtxtKey(xsltTransformContextPtr ctxt, xsltDocumentPtr idoc, xmlNodePtr oldContextNode; xsltDocumentPtr oldDocInfo; int oldXPPos, oldXPSize; + xmlNodePtr oldXPNode; xmlDocPtr oldXPDoc; int oldXPNsNr; xmlNsPtr *oldXPNamespaces; @@ -649,6 +652,7 @@ fprintf(stderr, "xsltInitCtxtKey %s : %d\n", keyDef->name, ctxt->keyInitLevel); oldDocInfo = ctxt->document; oldContextNode = ctxt->node; + oldXPNode = xpctxt->node; oldXPDoc = xpctxt->doc; oldXPPos = xpctxt->proximityPosition; oldXPSize = xpctxt->contextSize; @@ -847,6 +851,7 @@ error: /* * Restore context state. */ + xpctxt->node = oldXPNode; xpctxt->doc = oldXPDoc; xpctxt->nsNr = oldXPNsNr; xpctxt->namespaces = oldXPNamespaces; diff --git a/dll/3rdparty/libxslt/numbers.c b/dll/3rdparty/libxslt/numbers.c index 9b1fc3b8889..a77d15a07a5 100644 --- a/dll/3rdparty/libxslt/numbers.c +++ b/dll/3rdparty/libxslt/numbers.c @@ -19,7 +19,7 @@ #define SYMBOL_QUOTE ((xmlChar)'\'') -#define DEFAULT_TOKEN (xmlChar)'0' +#define DEFAULT_TOKEN '0' #define DEFAULT_SEPARATOR "." #define MAX_TOKENS 1024 @@ -28,7 +28,7 @@ typedef struct _xsltFormatToken xsltFormatToken; typedef xsltFormatToken *xsltFormatTokenPtr; struct _xsltFormatToken { xmlChar *separator; - xmlChar token; + int token; int width; }; @@ -90,20 +90,22 @@ xsltUTF8Charcmp(xmlChar *utf1, xmlChar *utf2) { (xsltUTF8Charcmp((letter), (self)->patternSeparator) == 0)) #define IS_DIGIT_ZERO(x) xsltIsDigitZero(x) -#define IS_DIGIT_ONE(x) xsltIsDigitZero((xmlChar)(x)-1) +#define IS_DIGIT_ONE(x) xsltIsDigitZero((x)-1) static int xsltIsDigitZero(unsigned int ch) { /* * Reference: ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt + * + * There a many more digit ranges in newer Unicode versions. These + * are only the zeros that match Digit in XML 1.0 (IS_DIGIT macro). */ switch (ch) { case 0x0030: case 0x0660: case 0x06F0: case 0x0966: case 0x09E6: case 0x0A66: case 0x0AE6: case 0x0B66: case 0x0C66: case 0x0CE6: case 0x0D66: case 0x0E50: - case 0x0E60: case 0x0F20: case 0x1040: case 0x17E0: - case 0x1810: case 0xFF10: + case 0x0ED0: case 0x0F20: return TRUE; default: return FALSE; @@ -365,11 +367,14 @@ xsltNumberFormatTokenize(const xmlChar *format, tokens->tokens[tokens->nTokens].token = val - 1; ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); - } - } else if ( (val == (xmlChar)'A') || - (val == (xmlChar)'a') || - (val == (xmlChar)'I') || - (val == (xmlChar)'i') ) { + } else { + tokens->tokens[tokens->nTokens].token = '0'; + tokens->tokens[tokens->nTokens].width = 1; + } + } else if ( (val == 'A') || + (val == 'a') || + (val == 'I') || + (val == 'i') ) { tokens->tokens[tokens->nTokens].token = val; ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); @@ -380,7 +385,7 @@ xsltNumberFormatTokenize(const xmlChar *format, * not support a numbering sequence that starts with that * token, it must use a format token of 1." */ - tokens->tokens[tokens->nTokens].token = (xmlChar)'0'; + tokens->tokens[tokens->nTokens].token = '0'; tokens->tokens[tokens->nTokens].width = 1; } /* @@ -629,42 +634,51 @@ xsltNumberFormatGetMultipleLevel(xsltTransformContextPtr context, { int amount = 0; int cnt; + xmlNodePtr oldCtxtNode; xmlNodePtr ancestor; xmlNodePtr preceding; xmlXPathParserContextPtr parser; - context->xpathCtxt->node = node; + oldCtxtNode = context->xpathCtxt->node; parser = xmlXPathNewParserContext(NULL, context->xpathCtxt); if (parser) { /* ancestor-or-self::*[count] */ - for (ancestor = node; - (ancestor != NULL) && (ancestor->type != XML_DOCUMENT_NODE); - ancestor = xmlXPathNextAncestor(parser, ancestor)) { - + ancestor = node; + while ((ancestor != NULL) && (ancestor->type != XML_DOCUMENT_NODE)) { if ((fromPat != NULL) && xsltTestCompMatchList(context, ancestor, fromPat)) break; /* for */ + /* + * The xmlXPathNext* iterators require that the context node is + * set to the start node. Calls to xsltTestCompMatch* may also + * leave the context node in an undefined state, so make sure + * that the context node is reset before each iterator invocation. + */ + if (xsltTestCompMatchCount(context, ancestor, countPat, node)) { /* count(preceding-sibling::*) */ cnt = 1; - for (preceding = - xmlXPathNextPrecedingSibling(parser, ancestor); - preceding != NULL; - preceding = - xmlXPathNextPrecedingSibling(parser, preceding)) { - + context->xpathCtxt->node = ancestor; + preceding = xmlXPathNextPrecedingSibling(parser, ancestor); + while (preceding != NULL) { if (xsltTestCompMatchCount(context, preceding, countPat, node)) cnt++; + context->xpathCtxt->node = ancestor; + preceding = + xmlXPathNextPrecedingSibling(parser, preceding); } array[amount++] = (double)cnt; if (amount >= max) break; /* for */ } + context->xpathCtxt->node = node; + ancestor = xmlXPathNextAncestor(parser, ancestor); } xmlXPathFreeParserContext(parser); } + context->xpathCtxt->node = oldCtxtNode; return amount; } @@ -798,6 +812,16 @@ xsltNumberFormat(xsltTransformContextPtr ctxt, output); } } + + /* + * Unlike `match` patterns, `count` and `from` patterns can contain + * variable references, so we have to clear the pattern match + * cache if the "direct" matching algorithm was used. + */ + if (data->countPat != NULL) + xsltCompMatchClearCache(ctxt, data->countPat); + if (data->fromPat != NULL) + xsltCompMatchClearCache(ctxt, data->fromPat); } /* Insert number as text node */ xsltCopyTextString(ctxt, ctxt->insert, xmlBufferContent(output), 0); @@ -818,7 +842,8 @@ XSLT_NUMBER_FORMAT_END: static int xsltFormatNumberPreSuffix(xsltDecimalFormatPtr self, xmlChar **format, xsltFormatNumberInfoPtr info) { - int count=0; /* will hold total length of prefix/suffix */ + /* will hold total length of prefix/suffix without quote characters */ + int count=0; int len; while (1) { @@ -916,7 +941,6 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self, xmlBufferPtr buffer; xmlChar *the_format, *prefix = NULL, *suffix = NULL; xmlChar *nprefix, *nsuffix = NULL; - xmlChar pchar; int prefix_length, suffix_length = 0, nprefix_length, nsuffix_length; double scale; int j, len; @@ -944,7 +968,7 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self, *result = xmlStrdup(BAD_CAST "-"); else *result = xmlStrdup(self->minusSign); - /* no-break on purpose */ + /* Intentional fall-through */ case 1: if ((self == NULL) || (self->infinity == NULL)) *result = xmlStrcat(*result, BAD_CAST "Infinity"); @@ -1241,14 +1265,13 @@ OUTPUT_NUMBER: xmlBufferAdd(buffer, self->minusSign, xmlUTF8Strsize(self->minusSign, 1)); /* Put the prefix into the buffer */ - for (j = 0; j < prefix_length; j++) { - if ((pchar = *prefix++) == SYMBOL_QUOTE) { - len = xmlUTF8Strsize(prefix, 1); - xmlBufferAdd(buffer, prefix, len); - prefix += len; - j += len - 1; /* length of symbol less length of quote */ - } else - xmlBufferAdd(buffer, &pchar, 1); + for (j = 0; j < prefix_length; ) { + if (*prefix == SYMBOL_QUOTE) + prefix++; + len = xmlUTF8Strsize(prefix, 1); + xmlBufferAdd(buffer, prefix, len); + prefix += len; + j += len; } /* Next do the integer part of the number */ @@ -1257,13 +1280,14 @@ OUTPUT_NUMBER: number = floor((scale * number + 0.5)) / scale; if ((self->grouping != NULL) && (self->grouping[0] != 0)) { + int gchar; len = xmlStrlen(self->grouping); - pchar = xsltGetUTF8Char(self->grouping, &len); + gchar = xsltGetUTF8Char(self->grouping, &len); xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, format_info.group, - pchar, len); + gchar, len); } else xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, @@ -1306,14 +1330,13 @@ OUTPUT_NUMBER: } } /* Put the suffix into the buffer */ - for (j = 0; j < suffix_length; j++) { - if ((pchar = *suffix++) == SYMBOL_QUOTE) { - len = xmlUTF8Strsize(suffix, 1); - xmlBufferAdd(buffer, suffix, len); - suffix += len; - j += len - 1; /* length of symbol less length of escape */ - } else - xmlBufferAdd(buffer, &pchar, 1); + for (j = 0; j < suffix_length; ) { + if (*suffix == SYMBOL_QUOTE) + suffix++; + len = xmlUTF8Strsize(suffix, 1); + xmlBufferAdd(buffer, suffix, len); + suffix += len; + j += len; } *result = xmlStrdup(xmlBufferContent(buffer)); diff --git a/dll/3rdparty/libxslt/pattern.c b/dll/3rdparty/libxslt/pattern.c index 1207913ad15..8741b46a6a7 100644 --- a/dll/3rdparty/libxslt/pattern.c +++ b/dll/3rdparty/libxslt/pattern.c @@ -94,7 +94,6 @@ struct _xsltCompMatch { xmlNsPtr *nsList; /* the namespaces in scope */ int nsNr; /* the number of namespaces in scope */ xsltStepOpPtr steps; /* ops for computation */ - int novar; /* doesn't contain variables */ }; typedef struct _xsltParserContext xsltParserContext; @@ -323,20 +322,14 @@ xsltCompMatchAdd(xsltParserContextPtr ctxt, xsltCompMatchPtr comp, xsltAllocateExtra(ctxt->style); } if (op == XSLT_OP_PREDICATE) { - xmlXPathContextPtr xctxt; + int flags = 0; - if (ctxt->style != NULL) - xctxt = xmlXPathNewContext(ctxt->style->doc); - else - xctxt = xmlXPathNewContext(NULL); #ifdef XML_XPATH_NOVAR if (novar != 0) - xctxt->flags = XML_XPATH_NOVAR; + flags = XML_XPATH_NOVAR; #endif - if (ctxt->style != NULL) - xctxt->dict = ctxt->style->dict; - comp->steps[comp->nbStep].comp = xmlXPathCtxtCompile(xctxt, value); - xmlXPathFreeContext(xctxt); + comp->steps[comp->nbStep].comp = xsltXPathCompileFlags(ctxt->style, + value, flags); if (comp->steps[comp->nbStep].comp == NULL) { xsltTransformError(NULL, ctxt->style, ctxt->elem, "Failed to compile predicate\n"); @@ -576,8 +569,7 @@ xsltTestCompMatchDirect(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp, } ix = 0; - if ((parent == NULL) || (node->doc == NULL) || isRVT || - (comp->novar == 0)) + if ((parent == NULL) || (node->doc == NULL) || isRVT) nocache = 1; if (nocache == 0) { @@ -1232,6 +1224,34 @@ xsltTestCompMatchList(xsltTransformContextPtr ctxt, xmlNodePtr node, return(0); } +/** + * xsltCompMatchClearCache: + * @ctxt: a XSLT process context + * @comp: the precompiled pattern list + * + * Clear pattern match cache. + */ +void +xsltCompMatchClearCache(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp) { + xsltStepOpPtr sel; + xmlXPathObjectPtr list; + + if ((ctxt == NULL) || (comp == NULL)) + return; + + sel = &comp->steps[0]; + list = (xmlXPathObjectPtr) XSLT_RUNTIME_EXTRA_LST(ctxt, sel->lenExtra); + + if (list != NULL) { + xmlXPathFreeObject(list); + + XSLT_RUNTIME_EXTRA_LST(ctxt, sel->lenExtra) = NULL; + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = NULL; + XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = 0; + XSLT_RUNTIME_EXTRA_FREE(ctxt, sel->lenExtra) = NULL; + } +} + /************************************************************************ * * * Dedicated parser for templates * @@ -1776,9 +1796,7 @@ xsltCompileRelativePathPattern(xsltParserContextPtr ctxt, xmlChar *token, int no PUSH(XSLT_OP_PARENT, NULL, NULL, novar); NEXT; SKIP_BLANKS; - if ((CUR != 0) && (CUR != '|')) { - xsltCompileRelativePathPattern(ctxt, NULL, novar); - } + xsltCompileStepPattern(ctxt, NULL, novar); } else { ctxt->error = 1; } @@ -1843,6 +1861,8 @@ xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) { xsltCompileIdKeyPattern(ctxt, name, 1, novar, 0); xmlFree(name); name = NULL; + if (ctxt->error) + return; if ((CUR == '/') && (NXT(1) == '/')) { PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar); NEXT; @@ -1953,7 +1973,6 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc, j++; } element->nsNr = j; - element->novar = novar; #ifdef WITH_XSLT_DEBUG_PATTERN @@ -2118,8 +2137,15 @@ xsltAddTemplate(xsltStylesheetPtr style, xsltTemplatePtr cur, xmlHashAddEntry2(style->namedTemplates, cur->name, cur->nameURI, cur); } - if (cur->match == NULL) + if (cur->match == NULL) { + if (cur->name == NULL) { + xsltTransformError(NULL, style, cur->elem, + "xsl:template: need to specify match or name attribute\n"); + style->errors++; + return(-1); + } return(0); + } priority = cur->priority; pat = xsltCompilePatternInternal(cur->match, style->doc, cur->elem, @@ -2345,6 +2371,7 @@ xsltGetTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, case XML_ELEMENT_NODE: if (node->name[0] == ' ') break; + /* Intentional fall-through */ case XML_ATTRIBUTE_NODE: case XML_PI_NODE: name = node->name; @@ -2382,7 +2409,7 @@ xsltGetTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, list = NULL; while (list != NULL) { if (xsltTestCompMatch(ctxt, list, node, - ctxt->mode, ctxt->modeURI)) { + ctxt->mode, ctxt->modeURI) == 1) { ret = list->template; priority = list->priority; break; @@ -2451,7 +2478,7 @@ xsltGetTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, while ((list != NULL) && ((ret == NULL) || (list->priority > priority))) { if (xsltTestCompMatch(ctxt, list, node, - ctxt->mode, ctxt->modeURI)) { + ctxt->mode, ctxt->modeURI) == 1) { ret = list->template; priority = list->priority; break; @@ -2468,7 +2495,7 @@ xsltGetTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, while ((list != NULL) && ((ret == NULL) || (list->priority > priority))) { if (xsltTestCompMatch(ctxt, list, node, - ctxt->mode, ctxt->modeURI)) { + ctxt->mode, ctxt->modeURI) == 1) { ret = list->template; priority = list->priority; break; @@ -2481,7 +2508,7 @@ xsltGetTemplate(xsltTransformContextPtr ctxt, xmlNodePtr node, while ((list != NULL) && ((ret == NULL) || (list->priority > priority))) { if (xsltTestCompMatch(ctxt, list, node, - ctxt->mode, ctxt->modeURI)) { + ctxt->mode, ctxt->modeURI) == 1) { ret = list->template; priority = list->priority; break; @@ -2496,7 +2523,7 @@ keyed_match: while ((list != NULL) && ((ret == NULL) || (list->priority > priority))) { if (xsltTestCompMatch(ctxt, list, node, - ctxt->mode, ctxt->modeURI)) { + ctxt->mode, ctxt->modeURI) == 1) { ret = list->template; priority = list->priority; break; diff --git a/dll/3rdparty/libxslt/security.c b/dll/3rdparty/libxslt/security.c index 6478cc5bba7..641677ced66 100644 --- a/dll/3rdparty/libxslt/security.c +++ b/dll/3rdparty/libxslt/security.c @@ -352,16 +352,18 @@ xsltCheckWrite(xsltSecurityPrefsPtr sec, (xmlStrEqual(BAD_CAST uri->scheme, BAD_CAST "file"))) { #if defined(_WIN32) && !defined(__CYGWIN__) - if ((uri->path)&&(uri->path[0]=='/')&& - (uri->path[1]!='\0')&&(uri->path[2]==':')) - ret = xsltCheckWritePath(sec, ctxt, uri->path+1); - else + if ((uri->path)&&(uri->path[0]=='/')&& + (uri->path[1]!='\0')&&(uri->path[2]==':')) + ret = xsltCheckWritePath(sec, ctxt, uri->path+1); + else #endif + { + /* + * Check if we are allowed to write this file + */ + ret = xsltCheckWritePath(sec, ctxt, uri->path); + } - /* - * Check if we are allowed to write this file - */ - ret = xsltCheckWritePath(sec, ctxt, uri->path); if (ret <= 0) { xmlFreeURI(uri); return(ret); diff --git a/dll/3rdparty/libxslt/templates.c b/dll/3rdparty/libxslt/templates.c index f997cea6e36..b6255e90b26 100644 --- a/dll/3rdparty/libxslt/templates.c +++ b/dll/3rdparty/libxslt/templates.c @@ -314,7 +314,7 @@ xsltAttrTemplateValueProcessNode(xsltTransformContextPtr ctxt, nsNr = i; } } - comp = xmlXPathCompile(expr); + comp = xmlXPathCtxtCompile(ctxt->xpathCtxt, expr); val = xsltEvalXPathStringNs(ctxt, comp, nsNr, nsList); xmlXPathFreeCompExpr(comp); xmlFree(expr); @@ -627,11 +627,12 @@ xmlAttrPtr xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt, xmlNodePtr target, xmlAttrPtr attrs) { - xmlAttrPtr attr, copy, last; + xmlAttrPtr attr, copy, last = NULL; xmlNodePtr oldInsert, text; xmlNsPtr origNs = NULL, copyNs = NULL; const xmlChar *value; xmlChar *valueAVT; + int hasAttr = 0; if ((ctxt == NULL) || (target == NULL) || (attrs == NULL) || (target->type != XML_ELEMENT_NODE)) @@ -641,15 +642,34 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt, ctxt->insert = target; /* - * Instantiate LRE-attributes. + * Apply attribute-sets. */ - if (target->properties) { - last = target->properties; - while (last->next != NULL) - last = last->next; - } else { - last = NULL; + attr = attrs; + do { +#ifdef XSLT_REFACTORED + if ((attr->psvi == xsltXSLTAttrMarker) && + xmlStrEqual(attr->name, (const xmlChar *)"use-attribute-sets")) + { + xsltApplyAttributeSet(ctxt, ctxt->node, (xmlNodePtr) attr, NULL); + } +#else + if ((attr->ns != NULL) && + xmlStrEqual(attr->name, (const xmlChar *)"use-attribute-sets") && + xmlStrEqual(attr->ns->href, XSLT_NAMESPACE)) + { + xsltApplyAttributeSet(ctxt, ctxt->node, (xmlNodePtr) attr, NULL); + } +#endif + attr = attr->next; + } while (attr != NULL); + + if (target->properties != NULL) { + hasAttr = 1; } + + /* + * Instantiate LRE-attributes. + */ attr = attrs; do { /* @@ -685,35 +705,7 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt, value = xmlDictLookup(ctxt->dict, BAD_CAST "", 0); /* - * Create a new attribute. - */ - copy = xmlNewDocProp(target->doc, attr->name, NULL); - if (copy == NULL) { - if (attr->ns) { - xsltTransformError(ctxt, NULL, attr->parent, - "Internal error: Failed to create attribute '{%s}%s'.\n", - attr->ns->href, attr->name); - } else { - xsltTransformError(ctxt, NULL, attr->parent, - "Internal error: Failed to create attribute '%s'.\n", - attr->name); - } - goto error; - } - /* - * Attach it to the target element. - */ - copy->parent = target; - if (last == NULL) { - target->properties = copy; - last = copy; - } else { - last->next = copy; - copy->prev = last; - last = copy; - } - /* - * Set the namespace. Avoid lookups of same namespaces. + * Get the namespace. Avoid lookups of same namespaces. */ if (attr->ns != origNs) { origNs = attr->ns; @@ -730,7 +722,47 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt, } else copyNs = NULL; } - copy->ns = copyNs; + /* + * Create a new attribute. + */ + if (hasAttr) { + copy = xmlSetNsProp(target, copyNs, attr->name, NULL); + } else { + /* + * Avoid checking for duplicate attributes if there aren't + * any attribute sets. + */ + copy = xmlNewDocProp(target->doc, attr->name, NULL); + + if (copy != NULL) { + copy->ns = copyNs; + + /* + * Attach it to the target element. + */ + copy->parent = target; + if (last == NULL) { + target->properties = copy; + last = copy; + } else { + last->next = copy; + copy->prev = last; + last = copy; + } + } + } + if (copy == NULL) { + if (attr->ns) { + xsltTransformError(ctxt, NULL, attr->parent, + "Internal error: Failed to create attribute '{%s}%s'.\n", + attr->ns->href, attr->name); + } else { + xsltTransformError(ctxt, NULL, attr->parent, + "Internal error: Failed to create attribute '%s'.\n", + attr->name); + } + goto error; + } /* * Set the value. @@ -785,30 +817,6 @@ next_attribute: attr = attr->next; } while (attr != NULL); - /* - * Apply attribute-sets. - * The creation of such attributes will not overwrite any existing - * attribute. - */ - attr = attrs; - do { -#ifdef XSLT_REFACTORED - if ((attr->psvi == xsltXSLTAttrMarker) && - xmlStrEqual(attr->name, (const xmlChar *)"use-attribute-sets")) - { - xsltApplyAttributeSet(ctxt, ctxt->node, (xmlNodePtr) attr, NULL); - } -#else - if ((attr->ns != NULL) && - xmlStrEqual(attr->name, (const xmlChar *)"use-attribute-sets") && - xmlStrEqual(attr->ns->href, XSLT_NAMESPACE)) - { - xsltApplyAttributeSet(ctxt, ctxt->node, (xmlNodePtr) attr, NULL); - } -#endif - attr = attr->next; - } while (attr != NULL); - ctxt->insert = oldInsert; return(target->properties); diff --git a/dll/3rdparty/libxslt/transform.c b/dll/3rdparty/libxslt/transform.c index 966304ea115..4db703be405 100644 --- a/dll/3rdparty/libxslt/transform.c +++ b/dll/3rdparty/libxslt/transform.c @@ -197,6 +197,8 @@ xsltTemplateParamsCleanup(xsltTransformContextPtr ctxt) ctxt->vars = NULL; } +#ifdef WITH_PROFILER + /** * profPush: * @ctxt: the transformation context @@ -305,6 +307,8 @@ profCallgraphAdd(xsltTemplatePtr templ, xsltTemplatePtr parent) } } +#endif /* WITH_PROFILER */ + /** * xsltPreCompEval: * @ctxt: transform context @@ -1055,6 +1059,8 @@ xsltCopyText(xsltTransformContextPtr ctxt, xmlNodePtr target, if ((copy->content = xmlStrdup(cur->content)) == NULL) return NULL; } + + ctxt->lasttext = NULL; } else { /* * normal processing. keep counters to extend the text node @@ -2170,6 +2176,7 @@ xsltProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr contextNode, } } +#ifdef WITH_DEBUGGER static xmlNodePtr xsltDebuggerStartSequenceConstructor(xsltTransformContextPtr ctxt, xmlNodePtr contextNode, @@ -2205,6 +2212,7 @@ xsltDebuggerStartSequenceConstructor(xsltTransformContextPtr ctxt, } return(debugedNode); } +#endif /* WITH_DEBUGGER */ /** * xsltLocalVariablePush: @@ -2376,6 +2384,17 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, */ cur = list; while (cur != NULL) { + if (ctxt->opLimit != 0) { + if (ctxt->opCount >= ctxt->opLimit) { + xsltTransformError(ctxt, NULL, cur, + "xsltApplySequenceConstructor: " + "Operation limit exceeded\n"); + ctxt->state = XSLT_STATE_STOPPED; + goto error; + } + ctxt->opCount += 1; + } + ctxt->inst = cur; #ifdef WITH_DEBUGGER @@ -2832,6 +2851,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, /* * Search if there are fallbacks */ + ctxt->insert = insert; child = cur->children; while (child != NULL) { if ((IS_XSLT_ELEM(child)) && @@ -2843,6 +2863,7 @@ xsltApplySequenceConstructor(xsltTransformContextPtr ctxt, } child = child->next; } + ctxt->insert = oldInsert; if (!found) { xsltTransformError(ctxt, NULL, cur, @@ -3051,10 +3072,12 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, xsltStackElemPtr withParams) { int oldVarsBase = 0; - long start = 0; xmlNodePtr cur; xsltStackElemPtr tmpParam = NULL; xmlDocPtr oldUserFragmentTop; +#ifdef WITH_PROFILER + long start = 0; +#endif #ifdef XSLT_REFACTORED xsltStyleItemParamPtr iparam; @@ -3109,12 +3132,16 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, ctxt->varsBase = ctxt->varsNr; ctxt->node = contextNode; + +#ifdef WITH_PROFILER if (ctxt->profile) { templ->nbCalls++; start = xsltTimestamp(); profPush(ctxt, 0); profCallgraphAdd(templ, ctxt->templ); } +#endif + /* * Push the xsl:template declaration onto the stack. */ @@ -3222,6 +3249,8 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, * Pop the xsl:template declaration from the stack. */ templPop(ctxt); + +#ifdef WITH_PROFILER if (ctxt->profile) { long spent, child, total, end; @@ -3242,6 +3271,7 @@ xsltApplyXSLTTemplate(xsltTransformContextPtr ctxt, if (ctxt->profNr > 0) ctxt->profTab[ctxt->profNr - 1] += total; } +#endif #ifdef WITH_DEBUGGER if ((ctxt->debugStatus != XSLT_DEBUG_NONE) && (addCallResult)) { @@ -3399,7 +3429,7 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, * XPath expression. * (see http://xml.apache.org/xalan-j/extensionslib.html#redirect) */ - cmp = xmlXPathCompile(URL); + cmp = xmlXPathCtxtCompile(ctxt->xpathCtxt, URL); val = xsltEvalXPathString(ctxt, cmp); xmlXPathFreeCompExpr(cmp); xmlFree(URL); @@ -3458,10 +3488,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, */ if (ctxt->sec != NULL) { ret = xsltCheckWrite(ctxt->sec, ctxt, filename); - if (ret == 0) { - xsltTransformError(ctxt, NULL, inst, - "xsltDocumentElem: write rights for %s denied\n", - filename); + if (ret <= 0) { + if (ret == 0) + xsltTransformError(ctxt, NULL, inst, + "xsltDocumentElem: write rights for %s denied\n", + filename); xmlFree(URL); xmlFree(filename); return; @@ -4962,7 +4993,7 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node, break; } } - /* no break on purpose */ + /* Intentional fall-through */ case XML_ELEMENT_NODE: case XML_DOCUMENT_NODE: case XML_HTML_DOCUMENT_NODE: @@ -5862,8 +5893,16 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, ctxt->initialContextDoc = doc; ctxt->initialContextNode = (xmlNodePtr) doc; - if (profile != NULL) + if (profile != NULL) { +#ifdef WITH_PROFILER ctxt->profile = 1; +#else + xsltTransformError(ctxt, NULL, (xmlNodePtr) doc, + "xsltApplyStylesheetInternal: " + "libxslt compiled without profiler\n"); + goto error; +#endif + } if (output != NULL) ctxt->outputFile = output; @@ -5976,6 +6015,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, res->encoding = xmlStrdup(encoding); variables = style->variables; + ctxt->node = (xmlNodePtr) doc; + ctxt->output = res; + + ctxt->xpathCtxt->contextSize = 1; + ctxt->xpathCtxt->proximityPosition = 1; + ctxt->xpathCtxt->node = NULL; /* TODO: Set the context node here? */ + /* * Start the evaluation, evaluate the params, the stylesheets globals * and start by processing the top node. @@ -5985,7 +6031,6 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, /* * Evaluate global params and user-provided params. */ - ctxt->node = (xmlNodePtr) doc; if (ctxt->globalVars == NULL) ctxt->globalVars = xmlHashCreate(20); if (params != NULL) { @@ -6000,14 +6045,9 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, /* Clean up any unused RVTs. */ xsltReleaseLocalRVTs(ctxt, NULL); - ctxt->node = (xmlNodePtr) doc; - ctxt->output = res; ctxt->insert = (xmlNodePtr) res; ctxt->varsBase = ctxt->varsNr - 1; - ctxt->xpathCtxt->contextSize = 1; - ctxt->xpathCtxt->proximityPosition = 1; - ctxt->xpathCtxt->node = NULL; /* TODO: Set the context node here? */ /* * Start processing the source tree ----------------------------------- */ @@ -6137,9 +6177,12 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, } } xmlXPathFreeNodeSet(ctxt->nodeList); + +#ifdef WITH_PROFILER if (profile != NULL) { xsltSaveProfiling(ctxt, profile); } +#endif /* * Be pedantic. diff --git a/dll/3rdparty/libxslt/variables.c b/dll/3rdparty/libxslt/variables.c index 3901a4204ad..2815c60bf11 100644 --- a/dll/3rdparty/libxslt/variables.c +++ b/dll/3rdparty/libxslt/variables.c @@ -184,7 +184,8 @@ xsltRegisterLocalRVT(xsltTransformContextPtr ctxt, * This function is unsupported in newer releases of libxslt. */ int -xsltExtensionInstructionResultFinalize(xsltTransformContextPtr ctxt) +xsltExtensionInstructionResultFinalize( + xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED) { xmlGenericError(xmlGenericErrorContext, "xsltExtensionInstructionResultFinalize is unsupported " @@ -209,8 +210,9 @@ xsltExtensionInstructionResultFinalize(xsltTransformContextPtr ctxt) * libxslt. */ int -xsltExtensionInstructionResultRegister(xsltTransformContextPtr ctxt, - xmlXPathObjectPtr obj) +xsltExtensionInstructionResultRegister( + xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED, + xmlXPathObjectPtr obj ATTRIBUTE_UNUSED) { return(0); } @@ -837,7 +839,7 @@ xsltEvalVariable(xsltTransformContextPtr ctxt, xsltStackElemPtr variable, if ((comp != NULL) && (comp->comp != NULL)) { xpExpr = comp->comp; } else { - xpExpr = xmlXPathCompile(variable->select); + xpExpr = xmlXPathCtxtCompile(ctxt->xpathCtxt, variable->select); } if (xpExpr == NULL) return(NULL); @@ -1078,7 +1080,7 @@ xsltEvalGlobalVariable(xsltStackElemPtr elem, xsltTransformContextPtr ctxt) if ((comp != NULL) && (comp->comp != NULL)) { xpExpr = comp->comp; } else { - xpExpr = xmlXPathCompile(elem->select); + xpExpr = xmlXPathCtxtCompile(ctxt->xpathCtxt, elem->select); } if (xpExpr == NULL) goto error; @@ -1529,7 +1531,7 @@ xsltProcessUserParamInternal(xsltTransformContextPtr ctxt, result = NULL; if (eval != 0) { - xpExpr = xmlXPathCompile(value); + xpExpr = xmlXPathCtxtCompile(ctxt->xpathCtxt, value); if (xpExpr != NULL) { xmlDocPtr oldXPDoc; xmlNodePtr oldXPContextNode; @@ -1946,7 +1948,7 @@ xsltVariableLookup(xsltTransformContextPtr ctxt, const xmlChar *name, * @inst: the xsl:with-param instruction element * * Processes an xsl:with-param instruction at transformation time. - * The value is compute, but not recorded. + * The value is computed, but not recorded. * NOTE that this is also called with an *xsl:param* element * from exsltFuncFunctionFunction(). * diff --git a/dll/3rdparty/libxslt/xslt.c b/dll/3rdparty/libxslt/xslt.c index e37a33f26f1..0c5eb2edcc0 100644 --- a/dll/3rdparty/libxslt/xslt.c +++ b/dll/3rdparty/libxslt/xslt.c @@ -563,10 +563,6 @@ xsltCompilationCtxtFree(xsltCompilerCtxtPtr cctxt) } if (cctxt->tmpList != NULL) xsltPointerListFree(cctxt->tmpList); -#ifdef XSLT_REFACTORED_XPATHCOMP - if (cctxt->xpathCtxt != NULL) - xmlXPathFreeContext(cctxt->xpathCtxt); -#endif if (cctxt->nsAliases != NULL) xsltFreeNsAliasList(cctxt->nsAliases); @@ -602,15 +598,6 @@ xsltCompilationCtxtCreate(xsltStylesheetPtr style) { if (ret->tmpList == NULL) { goto internal_err; } -#ifdef XSLT_REFACTORED_XPATHCOMP - /* - * Create the XPath compilation context in order - * to speed up precompilation of XPath expressions. - */ - ret->xpathCtxt = xmlXPathNewContext(NULL); - if (ret->xpathCtxt == NULL) - goto internal_err; -#endif return(ret); @@ -732,14 +719,15 @@ internal_err: #endif /** - * xsltNewStylesheet: + * xsltNewStylesheetInternal: + * @parent: the parent stylesheet or NULL * * Create a new XSLT Stylesheet * * Returns the newly allocated xsltStylesheetPtr or NULL in case of error */ -xsltStylesheetPtr -xsltNewStylesheet(void) { +static xsltStylesheetPtr +xsltNewStylesheetInternal(xsltStylesheetPtr parent) { xsltStylesheetPtr ret = NULL; ret = (xsltStylesheetPtr) xmlMalloc(sizeof(xsltStylesheet)); @@ -750,6 +738,7 @@ xsltNewStylesheet(void) { } memset(ret, 0, sizeof(xsltStylesheet)); + ret->parent = parent; ret->omitXmlDeclaration = -1; ret->standalone = -1; ret->decimalFormat = xsltNewDecimalFormat(NULL, NULL); @@ -770,6 +759,21 @@ xsltNewStylesheet(void) { "creating dictionary for stylesheet\n"); #endif + if (parent == NULL) { + ret->principal = ret; + + ret->xpathCtxt = xmlXPathNewContext(NULL); + if (ret->xpathCtxt == NULL) { + xsltTransformError(NULL, NULL, NULL, + "xsltNewStylesheet: xmlXPathNewContext failed\n"); + goto internal_err; + } + if (xmlXPathContextSetCache(ret->xpathCtxt, 1, -1, 0) == -1) + goto internal_err; + } else { + ret->principal = parent->principal; + } + xsltInit(); return(ret); @@ -780,6 +784,18 @@ internal_err: return(NULL); } +/** + * xsltNewStylesheet: + * + * Create a new XSLT Stylesheet + * + * Returns the newly allocated xsltStylesheetPtr or NULL in case of error + */ +xsltStylesheetPtr +xsltNewStylesheet(void) { + return xsltNewStylesheetInternal(NULL); +} + /** * xsltAllocateExtra: * @style: an XSLT stylesheet @@ -1036,6 +1052,9 @@ xsltFreeStylesheet(xsltStylesheetPtr style) #endif xmlDictFree(style->dict); + if (style->xpathCtxt != NULL) + xmlXPathFreeContext(style->xpathCtxt); + memset(style, -1, sizeof(xsltStylesheet)); xmlFree(style); } @@ -1320,8 +1339,8 @@ xsltParseStylesheetOutput(xsltStylesheetPtr style, xmlNodePtr cur) * via the stylesheet's error handling. */ xsltTransformError(NULL, style, cur, - "Attribute 'cdata-section-elements': The value " - "'%s' is not a valid QName.\n", element); + "Attribute 'cdata-section-elements': " + "Not a valid QName.\n"); style->errors++; } else { xmlNsPtr ns; @@ -5450,7 +5469,7 @@ error: /** * xsltIncludeComp: - * @cctxt: the compilation contenxt + * @cctxt: the compilation context * @node: the xsl:include node * * Process the xslt include node on the source node @@ -6503,54 +6522,67 @@ xsltParseStylesheetImportedDoc(xmlDocPtr doc, if (doc == NULL) return(NULL); - retStyle = xsltNewStylesheet(); + retStyle = xsltNewStylesheetInternal(parentStyle); if (retStyle == NULL) return(NULL); - /* - * Set the importing stylesheet module; also used to detect recursion. - */ - retStyle->parent = parentStyle; + + if (xsltParseStylesheetUser(retStyle, doc) != 0) { + xsltFreeStylesheet(retStyle); + return(NULL); + } + + return(retStyle); +} + +/** + * xsltParseStylesheetUser: + * @style: pointer to the stylesheet + * @doc: an xmlDoc parsed XML + * + * Parse an XSLT stylesheet with a user-provided stylesheet struct. + * + * Returns 0 if successful, -1 in case of error. + */ +int +xsltParseStylesheetUser(xsltStylesheetPtr style, xmlDocPtr doc) { + if ((style == NULL) || (doc == NULL)) + return(-1); + /* * Adjust the string dict. */ if (doc->dict != NULL) { - xmlDictFree(retStyle->dict); - retStyle->dict = doc->dict; + xmlDictFree(style->dict); + style->dict = doc->dict; #ifdef WITH_XSLT_DEBUG xsltGenericDebug(xsltGenericDebugContext, "reusing dictionary from %s for stylesheet\n", doc->URL); #endif - xmlDictReference(retStyle->dict); + xmlDictReference(style->dict); } /* * TODO: Eliminate xsltGatherNamespaces(); we must not restrict * the stylesheet to containt distinct namespace prefixes. */ - xsltGatherNamespaces(retStyle); + xsltGatherNamespaces(style); #ifdef XSLT_REFACTORED { xsltCompilerCtxtPtr cctxt; xsltStylesheetPtr oldCurSheet; - if (parentStyle == NULL) { + if (style->parent == NULL) { xsltPrincipalStylesheetDataPtr principalData; /* - * Principal stylesheet - * -------------------- - */ - retStyle->principal = retStyle; - /* * Create extra data for the principal stylesheet. */ principalData = xsltNewPrincipalStylesheetData(); if (principalData == NULL) { - xsltFreeStylesheet(retStyle); - return(NULL); + return(-1); } - retStyle->principalData = principalData; + style->principalData = principalData; /* * Create the compilation context * ------------------------------ @@ -6558,14 +6590,13 @@ xsltParseStylesheetImportedDoc(xmlDocPtr doc, * This is currently the only function where the * compilation context is created. */ - cctxt = xsltCompilationCtxtCreate(retStyle); + cctxt = xsltCompilationCtxtCreate(style); if (cctxt == NULL) { - xsltFreeStylesheet(retStyle); - return(NULL); + return(-1); } - retStyle->compCtxt = (void *) cctxt; - cctxt->style = retStyle; - cctxt->dict = retStyle->dict; + style->compCtxt = (void *) cctxt; + cctxt->style = style; + cctxt->dict = style->dict; cctxt->psData = principalData; /* * Push initial dummy node info. @@ -6576,22 +6607,21 @@ xsltParseStylesheetImportedDoc(xmlDocPtr doc, /* * Imported stylesheet. */ - retStyle->principal = parentStyle->principal; - cctxt = parentStyle->compCtxt; - retStyle->compCtxt = cctxt; + cctxt = style->parent->compCtxt; + style->compCtxt = cctxt; } /* * Save the old and set the current stylesheet structure in the * compilation context. */ oldCurSheet = cctxt->style; - cctxt->style = retStyle; + cctxt->style = style; - retStyle->doc = doc; - xsltParseStylesheetProcess(retStyle, doc); + style->doc = doc; + xsltParseStylesheetProcess(style, doc); cctxt->style = oldCurSheet; - if (parentStyle == NULL) { + if (style->parent == NULL) { /* * Pop the initial dummy node info. */ @@ -6602,65 +6632,54 @@ xsltParseStylesheetImportedDoc(xmlDocPtr doc, * stylesheets. * TODO: really? */ - /* retStyle->compCtxt = NULL; */ + /* style->compCtxt = NULL; */ } - /* - * Free the stylesheet if there were errors. - */ - if (retStyle != NULL) { - if (retStyle->errors != 0) { + #ifdef XSLT_REFACTORED_XSLT_NSCOMP - /* - * Restore all changes made to namespace URIs of ns-decls. - */ - if (cctxt->psData->nsMap) - xsltRestoreDocumentNamespaces(cctxt->psData->nsMap, doc); + if (style->errors != 0) { + /* + * Restore all changes made to namespace URIs of ns-decls. + */ + if (cctxt->psData->nsMap) + xsltRestoreDocumentNamespaces(cctxt->psData->nsMap, doc); + } #endif - /* - * Detach the doc from the stylesheet; otherwise the doc - * will be freed in xsltFreeStylesheet(). - */ - retStyle->doc = NULL; - /* - * Cleanup the doc if its the main stylesheet. - */ - if (parentStyle == NULL) { - xsltCleanupStylesheetTree(doc, xmlDocGetRootElement(doc)); - if (retStyle->compCtxt != NULL) { - xsltCompilationCtxtFree(retStyle->compCtxt); - retStyle->compCtxt = NULL; - } - } - xsltFreeStylesheet(retStyle); - retStyle = NULL; - } - } + if (style->parent == NULL) { + xsltCompilationCtxtFree(style->compCtxt); + style->compCtxt = NULL; + } } #else /* XSLT_REFACTORED */ /* * Old behaviour. */ - retStyle->doc = doc; - if (xsltParseStylesheetProcess(retStyle, doc) == NULL) { - retStyle->doc = NULL; - xsltFreeStylesheet(retStyle); - retStyle = NULL; - } - if (retStyle != NULL) { - if (retStyle->errors != 0) { - retStyle->doc = NULL; - if (parentStyle == NULL) - xsltCleanupStylesheetTree(doc, - xmlDocGetRootElement(doc)); - xsltFreeStylesheet(retStyle); - retStyle = NULL; - } + style->doc = doc; + if (xsltParseStylesheetProcess(style, doc) == NULL) { + style->doc = NULL; + return(-1); } #endif /* else of XSLT_REFACTORED */ - return(retStyle); + if (style->errors != 0) { + /* + * Detach the doc from the stylesheet; otherwise the doc + * will be freed in xsltFreeStylesheet(). + */ + style->doc = NULL; + /* + * Cleanup the doc if its the main stylesheet. + */ + if (style->parent == NULL) + xsltCleanupStylesheetTree(doc, xmlDocGetRootElement(doc)); + return(-1); + } + + if (style->parent == NULL) + xsltResolveStylesheetAttributeSet(style); + + return(0); } /** @@ -6678,27 +6697,9 @@ xsltParseStylesheetImportedDoc(xmlDocPtr doc, xsltStylesheetPtr xsltParseStylesheetDoc(xmlDocPtr doc) { - xsltStylesheetPtr ret; - xsltInitGlobals(); - ret = xsltParseStylesheetImportedDoc(doc, NULL); - if (ret == NULL) - return(NULL); - - xsltResolveStylesheetAttributeSet(ret); -#ifdef XSLT_REFACTORED - /* - * Free the compilation context. - * TODO: Check if it's better to move this cleanup to - * xsltParseStylesheetImportedDoc(). - */ - if (ret->compCtxt != NULL) { - xsltCompilationCtxtFree(XSLT_CCTXT(ret)); - ret->compCtxt = NULL; - } -#endif - return(ret); + return(xsltParseStylesheetImportedDoc(doc, NULL)); } /** @@ -6734,10 +6735,11 @@ xsltParseStylesheetFile(const xmlChar* filename) { int res; res = xsltCheckRead(sec, NULL, filename); - if (res == 0) { - xsltTransformError(NULL, NULL, NULL, - "xsltParseStylesheetFile: read rights for %s denied\n", - filename); + if (res <= 0) { + if (res == 0) + xsltTransformError(NULL, NULL, NULL, + "xsltParseStylesheetFile: read rights for %s denied\n", + filename); return(NULL); } } diff --git a/dll/3rdparty/libxslt/xsltconfig.h.in b/dll/3rdparty/libxslt/xsltconfig.h.in index 1dda1766c25..726e444db14 100644 --- a/dll/3rdparty/libxslt/xsltconfig.h.in +++ b/dll/3rdparty/libxslt/xsltconfig.h.in @@ -110,6 +110,19 @@ extern "C" { #endif #endif +/** + * WITH_PROFILER: + * + * Activate the compilation of the profiler. Speed penalty + * is insignifiant. + * On by default unless --without-profiler is passed to configure + */ +#if @WITH_PROFILER@ +#ifndef WITH_PROFILER +#define WITH_PROFILER +#endif +#endif + /** * WITH_MODULES: * @@ -129,9 +142,6 @@ extern "C" { * This macro is used to flag unused function parameters to GCC */ #ifdef __GNUC__ -#ifdef HAVE_ANSIDECL_H -#include <ansidecl.h> -#endif #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) #endif diff --git a/dll/3rdparty/libxslt/xsltutils.c b/dll/3rdparty/libxslt/xsltutils.c index ab65c0ad2dd..865936ade42 100644 --- a/dll/3rdparty/libxslt/xsltutils.c +++ b/dll/3rdparty/libxslt/xsltutils.c @@ -1554,7 +1554,15 @@ xsltSaveResultTo(xmlOutputBufferPtr buf, xmlDocPtr result, xmlOutputBufferWriteString(buf, "?>\n"); } if (result->children != NULL) { - xmlNodePtr child = result->children; + xmlNodePtr children = result->children; + xmlNodePtr child = children; + + /* + * Hack to avoid quadratic behavior when scanning + * result->children in xmlGetIntSubset called by + * xmlNodeDumpOutput. + */ + result->children = NULL; while (child != NULL) { xmlNodeDumpOutput(buf, result, child, 0, (indent == 1), @@ -1567,6 +1575,8 @@ xsltSaveResultTo(xmlOutputBufferPtr buf, xmlDocPtr result, } if (indent) xmlOutputBufferWriteString(buf, "\n"); + + result->children = children; } xmlOutputBufferFlush(buf); } @@ -1764,6 +1774,8 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, return 0; } +#ifdef WITH_PROFILER + /************************************************************************ * * * Generating profiling information * @@ -2241,6 +2253,8 @@ xsltGetProfileInformation(xsltTransformContextPtr ctxt) return ret; } +#endif /* WITH_PROFILER */ + /************************************************************************ * * * Hooks for libxml2 XPath * @@ -2264,25 +2278,7 @@ xsltXPathCompileFlags(xsltStylesheetPtr style, const xmlChar *str, int flags) { xmlXPathCompExprPtr ret; if (style != NULL) { -#ifdef XSLT_REFACTORED_XPATHCOMP - if (XSLT_CCTXT(style)) { - /* - * Proposed by Jerome Pesenti - * -------------------------- - * For better efficiency we'll reuse the compilation - * context's XPath context. For the common stylesheet using - * XPath expressions this will reduce compilation time to - * about 50%. - * - * See http://mail.gnome.org/archives/xslt/2006-April/msg00037.html - */ - xpathCtxt = XSLT_CCTXT(style)->xpathCtxt; - xpathCtxt->doc = style->doc; - } else - xpathCtxt = xmlXPathNewContext(style->doc); -#else - xpathCtxt = xmlXPathNewContext(style->doc); -#endif + xpathCtxt = style->principal->xpathCtxt; if (xpathCtxt == NULL) return NULL; xpathCtxt->dict = style->dict; @@ -2298,13 +2294,9 @@ xsltXPathCompileFlags(xsltStylesheetPtr style, const xmlChar *str, int flags) { */ ret = xmlXPathCtxtCompile(xpathCtxt, str); -#ifdef XSLT_REFACTORED_XPATHCOMP - if ((style == NULL) || (! XSLT_CCTXT(style))) { + if (style == NULL) { xmlXPathFreeContext(xpathCtxt); } -#else - xmlXPathFreeContext(xpathCtxt); -#endif /* * TODO: there is a lot of optimizations which should be possible * like variable slot precomputations, function precomputations, etc. @@ -2334,6 +2326,23 @@ xsltXPathCompile(xsltStylesheetPtr style, const xmlChar *str) { * * ************************************************************************/ +int xslDebugStatus; + +/** + * xsltGetDebuggerStatus: + * + * Get xslDebugStatus. + * + * Returns the value of xslDebugStatus. + */ +int +xsltGetDebuggerStatus(void) +{ + return(xslDebugStatus); +} + +#ifdef WITH_DEBUGGER + /* * There is currently only 3 debugging callback defined * Debugger callbacks are disabled by default @@ -2354,8 +2363,6 @@ static xsltDebuggerCallbacks xsltDebuggerCurrentCallbacks = { NULL /* drop */ }; -int xslDebugStatus; - /** * xsltSetDebuggerStatus: * @value : the value to be set @@ -2368,19 +2375,6 @@ xsltSetDebuggerStatus(int value) xslDebugStatus = value; } -/** - * xsltGetDebuggerStatus: - * - * Get xslDebugStatus. - * - * Returns the value of xslDebugStatus. - */ -int -xsltGetDebuggerStatus(void) -{ - return(xslDebugStatus); -} - /** * xsltSetDebuggerCallbacks: * @no : number of callbacks @@ -2455,3 +2449,5 @@ xslDropCall(void) xsltDebuggerCurrentCallbacks.drop(); } +#endif /* WITH_DEBUGGER */ + diff --git a/dll/3rdparty/libxslt/xsltwin32config.h b/dll/3rdparty/libxslt/xsltwin32config.h index a9938e155f9..fe7c7fc3410 100644 --- a/dll/3rdparty/libxslt/xsltwin32config.h +++ b/dll/3rdparty/libxslt/xsltwin32config.h @@ -23,21 +23,21 @@ extern "C" { * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.33" +#define LIBXSLT_DOTTED_VERSION "1.1.34" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXSLT_VERSION 10133 +#define LIBXSLT_VERSION 10134 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXSLT_VERSION_STRING "10133" +#define LIBXSLT_VERSION_STRING "10134" /** * LIBXSLT_VERSION_EXTRA: diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b7b42577e07..6404f8a77ef 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -44,7 +44,7 @@ Used Version: 2.9.10 Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: Libxslt -Used Version: 1.1.33 +Used Version: 1.1.34 Website: http://xmlsoft.org Title: ZLib diff --git a/sdk/include/reactos/libs/libxslt/pattern.h b/sdk/include/reactos/libs/libxslt/pattern.h index eb21be32937..a0991c0ce83 100644 --- a/sdk/include/reactos/libs/libxslt/pattern.h +++ b/sdk/include/reactos/libs/libxslt/pattern.h @@ -44,6 +44,9 @@ XSLTPUBFUN int XSLTCALL xsltTestCompMatchList (xsltTransformContextPtr ctxt, xmlNodePtr node, xsltCompMatchPtr comp); +XSLTPUBFUN void XSLTCALL + xsltCompMatchClearCache (xsltTransformContextPtr ctxt, + xsltCompMatchPtr comp); XSLTPUBFUN void XSLTCALL xsltNormalizeCompSteps (void *payload, void *data, diff --git a/sdk/include/reactos/libs/libxslt/xsltInternals.h b/sdk/include/reactos/libs/libxslt/xsltInternals.h index f9066adc93d..14a971aaa30 100644 --- a/sdk/include/reactos/libs/libxslt/xsltInternals.h +++ b/sdk/include/reactos/libs/libxslt/xsltInternals.h @@ -105,14 +105,6 @@ extern const xmlChar *xsltXSLTAttrMarker; */ /* #define XSLT_REFACTORED_XSLT_NSCOMP */ -/** - * XSLT_REFACTORED_XPATHCOMP: - * - * Internal define to enable the optimization of the - * compilation of XPath expressions. - */ -#define XSLT_REFACTORED_XPATHCOMP - #ifdef XSLT_REFACTORED_XSLT_NSCOMP extern const xmlChar *xsltConstNamespaceNameXSLT; @@ -478,7 +470,7 @@ typedef void (*xsltElemPreCompDeallocator) (xsltElemPreCompPtr comp); */ struct _xsltElemPreComp { xsltElemPreCompPtr next; /* next item in the global chained - list hold by xsltStylesheet. */ + list held by xsltStylesheet. */ xsltStyleType type; /* type of the element */ xsltTransformFunction func; /* handling function */ xmlNodePtr inst; /* the node in the stylesheet's tree @@ -590,7 +582,7 @@ struct _xsltNsListContainer { */ struct _xsltStylePreComp { xsltElemPreCompPtr next; /* next item in the global chained - list hold by xsltStylesheet */ + list held by xsltStylesheet */ xsltStyleType type; /* type of the item */ xsltTransformFunction func; /* handling function */ xmlNodePtr inst; /* the node in the stylesheet's tree @@ -1346,9 +1338,6 @@ struct _xsltCompilerCtxt { */ int strict; xsltPrincipalStylesheetDataPtr psData; -#ifdef XSLT_REFACTORED_XPATHCOMP - xmlXPathContextPtr xpathCtxt; -#endif xsltStyleItemUknownPtr unknownItem; int hasNsAliases; /* Indicator if there was an xsl:namespace-alias. */ xsltNsAliasPtr nsAliases; @@ -1642,6 +1631,8 @@ struct _xsltStylesheet { int forwards_compatible; xmlHashTablePtr namedTemplates; /* hash table of named templates */ + + xmlXPathContextPtr xpathCtxt; }; typedef struct _xsltTransformCache xsltTransformCache; @@ -1789,6 +1780,8 @@ struct _xsltTransformContext { int depth; /* Needed to catch recursions */ int maxTemplateDepth; int maxTemplateVars; + unsigned long opLimit; + unsigned long opCount; }; /** @@ -1871,6 +1864,9 @@ XSLTPUBFUN xsltStylesheetPtr XSLTCALL XSLTPUBFUN xsltStylesheetPtr XSLTCALL xsltParseStylesheetImportedDoc(xmlDocPtr doc, xsltStylesheetPtr style); +XSLTPUBFUN int XSLTCALL + xsltParseStylesheetUser(xsltStylesheetPtr style, + xmlDocPtr doc); XSLTPUBFUN xsltStylesheetPtr XSLTCALL xsltLoadStylesheetPI (xmlDocPtr doc); XSLTPUBFUN void XSLTCALL diff --git a/sdk/include/reactos/libs/libxslt/xsltconfig.h b/sdk/include/reactos/libs/libxslt/xsltconfig.h index 11ececce723..5d6f73f0402 100644 --- a/sdk/include/reactos/libs/libxslt/xsltconfig.h +++ b/sdk/include/reactos/libs/libxslt/xsltconfig.h @@ -20,21 +20,21 @@ extern "C" { * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.33" +#define LIBXSLT_DOTTED_VERSION "1.1.34" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXSLT_VERSION 10133 +#define LIBXSLT_VERSION 10134 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXSLT_VERSION_STRING "10133" +#define LIBXSLT_VERSION_STRING "10134" /** * LIBXSLT_VERSION_EXTRA: @@ -110,6 +110,19 @@ extern "C" { #endif #endif +/** + * WITH_PROFILER: + * + * Activate the compilation of the profiler. Speed penalty + * is insignifiant. + * On by default unless --without-profiler is passed to configure + */ +#if 0 +#ifndef WITH_PROFILER +#define WITH_PROFILER +#endif +#endif + /** * WITH_MODULES: * @@ -129,9 +142,6 @@ extern "C" { * This macro is used to flag unused function parameters to GCC */ #ifdef __GNUC__ -#ifdef HAVE_ANSIDECL_H -#include <ansidecl.h> -#endif #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((unused)) #endif diff --git a/sdk/include/reactos/libs/libxslt/xsltutils.h b/sdk/include/reactos/libs/libxslt/xsltutils.h index 789865a63dc..ea6c3740540 100644 --- a/sdk/include/reactos/libs/libxslt/xsltutils.h +++ b/sdk/include/reactos/libs/libxslt/xsltutils.h @@ -80,7 +80,7 @@ extern "C" { ((n)->type == XML_PI_NODE))) /* - * Our own version of namespaced atributes lookup. + * Our own version of namespaced attributes lookup. */ XSLTPUBFUN xmlChar * XSLTCALL xsltGetNsProp (xmlNodePtr node,

1 0

[reactos] 01/02: [LIBXML2] Update to version 2.9.10. CORE-16952
by Thomas Faber 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f22fa382fe9c0d0593dd6… commit f22fa382fe9c0d0593dd62278ada90da5e6feefe Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Apr 22 23:32:51 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Apr 24 14:44:52 2020 +0200 [LIBXML2] Update to version 2.9.10. CORE-16952 --- media/doc/3rd Party Files.txt | 4 +- sdk/include/reactos/libs/libxml/c14n.h | 12 +- sdk/include/reactos/libs/libxml/catalog.h | 2 +- sdk/include/reactos/libs/libxml/dict.h | 19 +- sdk/include/reactos/libs/libxml/hash.h | 4 +- sdk/include/reactos/libs/libxml/parser.h | 8 +- sdk/include/reactos/libs/libxml/parserInternals.h | 2 +- sdk/include/reactos/libs/libxml/schemasInternals.h | 12 +- sdk/include/reactos/libs/libxml/tree.h | 2 +- sdk/include/reactos/libs/libxml/xlink.h | 2 +- sdk/include/reactos/libs/libxml/xmlIO.h | 4 +- sdk/include/reactos/libs/libxml/xmlerror.h | 2 +- sdk/include/reactos/libs/libxml/xmlexports.h | 9 - sdk/include/reactos/libs/libxml/xmlversion.h | 19 +- sdk/include/reactos/libs/libxml/xmlversion.h.in | 7 +- sdk/include/reactos/libs/libxml/xpath.h | 13 +- sdk/lib/3rdparty/libxml2/ChangeLog | 112 +- sdk/lib/3rdparty/libxml2/HTMLparser.c | 31 +- sdk/lib/3rdparty/libxml2/HTMLtree.c | 2 +- sdk/lib/3rdparty/libxml2/NEWS | 473 +++++- sdk/lib/3rdparty/libxml2/README | 1 + sdk/lib/3rdparty/libxml2/SAX2.c | 22 +- sdk/lib/3rdparty/libxml2/buf.c | 12 +- sdk/lib/3rdparty/libxml2/c14n.c | 12 +- sdk/lib/3rdparty/libxml2/catalog.c | 2 +- sdk/lib/3rdparty/libxml2/debugXML.c | 22 +- sdk/lib/3rdparty/libxml2/dict.c | 13 +- sdk/lib/3rdparty/libxml2/elfgcchack.h | 10 + sdk/lib/3rdparty/libxml2/enc.h | 2 +- sdk/lib/3rdparty/libxml2/encoding.c | 18 +- sdk/lib/3rdparty/libxml2/entities.c | 6 +- sdk/lib/3rdparty/libxml2/error.c | 4 +- sdk/lib/3rdparty/libxml2/globals.c | 6 +- sdk/lib/3rdparty/libxml2/hash.c | 9 +- sdk/lib/3rdparty/libxml2/include/win32config.h | 2 +- sdk/lib/3rdparty/libxml2/include/wsockcompat.h | 5 + sdk/lib/3rdparty/libxml2/libxml.h | 13 +- sdk/lib/3rdparty/libxml2/nanohttp.c | 4 +- sdk/lib/3rdparty/libxml2/parser.c | 574 +++---- sdk/lib/3rdparty/libxml2/parserInternals.c | 8 +- sdk/lib/3rdparty/libxml2/pattern.c | 17 +- sdk/lib/3rdparty/libxml2/relaxng.c | 90 +- sdk/lib/3rdparty/libxml2/save.h | 5 +- sdk/lib/3rdparty/libxml2/schematron.c | 8 +- sdk/lib/3rdparty/libxml2/threads.c | 8 +- sdk/lib/3rdparty/libxml2/timsort.h | 7 +- sdk/lib/3rdparty/libxml2/tree.c | 90 +- sdk/lib/3rdparty/libxml2/trio.c | 4 +- sdk/lib/3rdparty/libxml2/trionan.c | 4 +- sdk/lib/3rdparty/libxml2/uri.c | 20 +- sdk/lib/3rdparty/libxml2/valid.c | 193 ++- sdk/lib/3rdparty/libxml2/xinclude.c | 26 +- sdk/lib/3rdparty/libxml2/xmlIO.c | 59 +- sdk/lib/3rdparty/libxml2/xmllint.c | 92 +- sdk/lib/3rdparty/libxml2/xmlmodule.c | 4 +- sdk/lib/3rdparty/libxml2/xmlreader.c | 87 +- sdk/lib/3rdparty/libxml2/xmlregexp.c | 99 +- sdk/lib/3rdparty/libxml2/xmlsave.c | 23 +- sdk/lib/3rdparty/libxml2/xmlschemas.c | 188 +-- sdk/lib/3rdparty/libxml2/xmlschemastypes.c | 20 +- sdk/lib/3rdparty/libxml2/xmlwriter.c | 6 +- sdk/lib/3rdparty/libxml2/xpath.c | 1697 ++++++++------------ sdk/lib/3rdparty/libxml2/xpointer.c | 18 +- sdk/lib/3rdparty/libxml2/xzlib.c | 4 +- sdk/lib/3rdparty/libxml2/xzlib.h | 2 +- 65 files changed, 2222 insertions(+), 2033 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 08e0455139c..b7b42577e07 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -40,7 +40,7 @@ Used Version: 1.0 REV 5 Website: http://www.gnu.org/software/adns/ | http://adns.jgaa.com Title: LibXML -Used Version: 2.9.9 +Used Version: 2.9.10 Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: Libxslt @@ -84,7 +84,7 @@ Used Version: 4.1.0 Website: http://www.simplesystems.org/libtiff/ Title: mbed TLS -Used Version: 2.7.14 +Used Version: 2.7.15 Website: https://tls.mbed.org/ Title: libpng diff --git a/sdk/include/reactos/libs/libxml/c14n.h b/sdk/include/reactos/libs/libxml/c14n.h index b8971d92046..d74847df842 100644 --- a/sdk/include/reactos/libs/libxml/c14n.h +++ b/sdk/include/reactos/libs/libxml/c14n.h @@ -28,17 +28,17 @@ extern "C" { #include <libxml/xpath.h> /* - * XML Canonicazation + * XML Canonicalization * http://www.w3.org/TR/xml-c14n * - * Exclusive XML Canonicazation + * Exclusive XML Canonicalization * http://www.w3.org/TR/xml-exc-c14n * * Canonical form of an XML document could be created if and only if * a) default attributes (if any) are added to all nodes * b) all character and parsed entity references are resolved - * In order to achive this in libxml2 the document MUST be loaded with - * following global setings: + * In order to achieve this in libxml2 the document MUST be loaded with + * following global settings: * * xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS; * xmlSubstituteEntitiesDefault(1); @@ -59,7 +59,7 @@ extern "C" { * */ typedef enum { - XML_C14N_1_0 = 0, /* Origianal C14N 1.0 spec */ + XML_C14N_1_0 = 0, /* Original C14N 1.0 spec */ XML_C14N_EXCLUSIVE_1_0 = 1, /* Exclusive C14N 1.0 spec */ XML_C14N_1_1 = 2 /* C14N 1.1 spec */ } xmlC14NMode; @@ -96,7 +96,7 @@ XMLPUBFUN int XMLCALL /** * xmlC14NIsVisibleCallback: * @user_data: user data - * @node: the curent node + * @node: the current node * @parent: the parent node * * Signature for a C14N callback on visible nodes diff --git a/sdk/include/reactos/libs/libxml/catalog.h b/sdk/include/reactos/libs/libxml/catalog.h index 5a13f51b6c6..26b178dbbc9 100644 --- a/sdk/include/reactos/libs/libxml/catalog.h +++ b/sdk/include/reactos/libs/libxml/catalog.h @@ -39,7 +39,7 @@ extern "C" { /** * XML_CATALOG_PI: * - * The specific XML Catalog Processing Instuction name. + * The specific XML Catalog Processing Instruction name. */ #define XML_CATALOG_PI \ (const xmlChar *) "oasis-xml-catalog" diff --git a/sdk/include/reactos/libs/libxml/dict.h b/sdk/include/reactos/libs/libxml/dict.h index b83db59a126..cf54af1f252 100644 --- a/sdk/include/reactos/libs/libxml/dict.h +++ b/sdk/include/reactos/libs/libxml/dict.h @@ -11,25 +11,18 @@ #ifndef __XML_DICT_H__ #define __XML_DICT_H__ +#include <stddef.h> +#include <libxml/xmlversion.h> + #ifdef __cplusplus -#define __XML_EXTERNC extern "C" -#else -#define __XML_EXTERNC +extern "C" { #endif /* * The dictionary. */ -__XML_EXTERNC typedef struct _xmlDict xmlDict; -__XML_EXTERNC typedef xmlDict *xmlDictPtr; - -#include <limits.h> -#include <libxml/xmlversion.h> -#include <libxml/tree.h> - -#ifdef __cplusplus -extern "C" { -#endif +typedef struct _xmlDict xmlDict; +typedef xmlDict *xmlDictPtr; /* * Initializer diff --git a/sdk/include/reactos/libs/libxml/hash.h b/sdk/include/reactos/libs/libxml/hash.h index 6352874ef26..b682b6b9403 100644 --- a/sdk/include/reactos/libs/libxml/hash.h +++ b/sdk/include/reactos/libs/libxml/hash.h @@ -80,7 +80,7 @@ typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name); /** * xmlHashScanner: * @payload: the data in the hash - * @data: extra scannner data + * @data: extra scanner data * @name: the name associated * * Callback when scanning data in a hash with the simple scanner. @@ -89,7 +89,7 @@ typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name); /** * xmlHashScannerFull: * @payload: the data in the hash - * @data: extra scannner data + * @data: extra scanner data * @name: the name associated * @name2: the second name associated * @name3: the third name associated diff --git a/sdk/include/reactos/libs/libxml/parser.h b/sdk/include/reactos/libs/libxml/parser.h index 47fbec03f7e..c295554f36a 100644 --- a/sdk/include/reactos/libs/libxml/parser.h +++ b/sdk/include/reactos/libs/libxml/parser.h @@ -283,11 +283,11 @@ struct _xmlParserCtxt { void * *pushTab; /* array of data for push */ xmlHashTablePtr attsDefault; /* defaulted attributes if any */ xmlHashTablePtr attsSpecial; /* non-CDATA attributes if any */ - int nsWellFormed; /* is the document XML Nanespace okay */ + int nsWellFormed; /* is the document XML Namespace okay */ int options; /* Extra options */ /* - * Those fields are needed only for treaming parsing so far + * Those fields are needed only for streaming parsing so far */ int dictNames; /* Use dictionary names for the tree */ int freeElemsNr; /* number of freed element nodes */ @@ -1097,7 +1097,7 @@ typedef enum { XML_PARSE_PEDANTIC = 1<<7, /* pedantic error reporting */ XML_PARSE_NOBLANKS = 1<<8, /* remove blank nodes */ XML_PARSE_SAX1 = 1<<9, /* use the SAX1 interface internally */ - XML_PARSE_XINCLUDE = 1<<10,/* Implement XInclude substitition */ + XML_PARSE_XINCLUDE = 1<<10,/* Implement XInclude substitution */ XML_PARSE_NONET = 1<<11,/* Forbid network access */ XML_PARSE_NODICT = 1<<12,/* Do not reuse the context dictionary */ XML_PARSE_NSCLEAN = 1<<13,/* remove redundant namespaces declarations */ @@ -1191,7 +1191,7 @@ XMLPUBFUN xmlDocPtr XMLCALL /** * xmlFeature: * - * Used to examine the existance of features that can be enabled + * Used to examine the existence of features that can be enabled * or disabled at compile-time. * They used to be called XML_FEATURE_xxx but this clashed with Expat */ diff --git a/sdk/include/reactos/libs/libxml/parserInternals.h b/sdk/include/reactos/libs/libxml/parserInternals.h index f30fc6876d6..1f26ce20810 100644 --- a/sdk/include/reactos/libs/libxml/parserInternals.h +++ b/sdk/include/reactos/libs/libxml/parserInternals.h @@ -43,7 +43,7 @@ XMLPUBVAR unsigned int xmlParserMaxDepth; /** * XML_MAX_NAME_LENGTH: * - * Maximum size allowed for a markup identitier + * Maximum size allowed for a markup identifier. * This is not a limitation of the parser but a safety boundary feature, * use XML_PARSE_HUGE option to override it. * Note that with the use of parsing dictionaries overriding the limit diff --git a/sdk/include/reactos/libs/libxml/schemasInternals.h b/sdk/include/reactos/libs/libxml/schemasInternals.h index 6fb71139ce9..c521d1c184c 100644 --- a/sdk/include/reactos/libs/libxml/schemasInternals.h +++ b/sdk/include/reactos/libs/libxml/schemasInternals.h @@ -321,13 +321,13 @@ struct _xmlSchemaWildcard { /** * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED: * - * The attribute wildcard has been already builded. + * The attribute wildcard has been built. */ #define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED 1 << 0 /** * XML_SCHEMAS_ATTRGROUP_GLOBAL: * - * The attribute wildcard has been already builded. + * The attribute group has been defined. */ #define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1 /** @@ -725,7 +725,7 @@ struct _xmlSchemaType { /** * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION: * - * disallowed substitutions: "substituion" + * disallowed substitutions: "substitution" */ #define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION 1 << 13 /** @@ -789,7 +789,7 @@ struct _xmlSchemaElement { xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */ xmlSchemaContentType contentType; const xmlChar *refPrefix; /* Deprecated; not used */ - xmlSchemaValPtr defVal; /* The compiled value contraint. */ + xmlSchemaValPtr defVal; /* The compiled value constraint. */ void *idcs; /* The identity-constraint defs */ }; @@ -881,7 +881,7 @@ struct _xmlSchemaNotation { /** * XML_SCHEMAS_FINAL_DEFAULT_LIST: * - * the cshema has "list" in the set of finalDefault. + * the schema has "list" in the set of finalDefault. */ #define XML_SCHEMAS_FINAL_DEFAULT_LIST 1 << 4 /** @@ -942,7 +942,7 @@ struct _xmlSchema { xmlDictPtr dict; void *includes; /* the includes, this is opaque for now */ int preserve; /* whether to free the document */ - int counter; /* used to give ononymous components unique names */ + int counter; /* used to give anonymous components unique names */ xmlHashTablePtr idcDef; /* All identity-constraint defs. */ void *volatiles; /* Obsolete */ }; diff --git a/sdk/include/reactos/libs/libxml/tree.h b/sdk/include/reactos/libs/libxml/tree.h index 626ed6ae384..6cfd73188cf 100644 --- a/sdk/include/reactos/libs/libxml/tree.h +++ b/sdk/include/reactos/libs/libxml/tree.h @@ -527,7 +527,7 @@ struct _xmlNode { * xmlDocProperty * * Set of properties of the document as found by the parser - * Some of them are linked to similary named xmlParserOption + * Some of them are linked to similarly named xmlParserOption */ typedef enum { XML_DOC_WELLFORMED = 1<<0, /* document is XML well formed */ diff --git a/sdk/include/reactos/libs/libxml/xlink.h b/sdk/include/reactos/libs/libxml/xlink.h index a209a9976d8..04e4b32c015 100644 --- a/sdk/include/reactos/libs/libxml/xlink.h +++ b/sdk/include/reactos/libs/libxml/xlink.h @@ -26,7 +26,7 @@ extern "C" { * of namespaces. If "foo" is the prefix for "http://foo.com/" * then the link detection layer will expand role="foo:myrole" * to "http://foo.com/:myrole". - * NOTE: the link detection layer will expand URI-Refences found on + * NOTE: the link detection layer will expand URI-References found on * href attributes by using the base mechanism if found. */ typedef xmlChar *xlinkHRef; diff --git a/sdk/include/reactos/libs/libxml/xmlIO.h b/sdk/include/reactos/libs/libxml/xmlIO.h index 3e41744deb0..8690d668c25 100644 --- a/sdk/include/reactos/libs/libxml/xmlIO.h +++ b/sdk/include/reactos/libs/libxml/xmlIO.h @@ -27,7 +27,7 @@ extern "C" { * @filename: the filename or URI * * Callback used in the I/O Input API to detect if the current handler - * can provide input fonctionnalities for this resource. + * can provide input functionality for this resource. * * Returns 1 if yes and 0 if another Input module should be used */ @@ -73,7 +73,7 @@ typedef int (XMLCALL *xmlInputCloseCallback) (void * context); * @filename: the filename or URI * * Callback used in the I/O Output API to detect if the current handler - * can provide output fonctionnalities for this resource. + * can provide output functionality for this resource. * * Returns 1 if yes and 0 if another Output module should be used */ diff --git a/sdk/include/reactos/libs/libxml/xmlerror.h b/sdk/include/reactos/libs/libxml/xmlerror.h index 037c16d5704..c1019971f24 100644 --- a/sdk/include/reactos/libs/libxml/xmlerror.h +++ b/sdk/include/reactos/libs/libxml/xmlerror.h @@ -837,7 +837,7 @@ typedef enum { * xmlGenericErrorFunc: * @ctx: a parsing context * @msg: the message - * @...: the extra arguments of the varags to format the message + * @...: the extra arguments of the varargs to format the message * * Signature of the function to use when there is an error and * no parsing or validity context available . diff --git a/sdk/include/reactos/libs/libxml/xmlexports.h b/sdk/include/reactos/libs/libxml/xmlexports.h index 31ab8a10abd..f03af0d03a6 100644 --- a/sdk/include/reactos/libs/libxml/xmlexports.h +++ b/sdk/include/reactos/libs/libxml/xmlexports.h @@ -73,9 +73,6 @@ #define XMLCALL __cdecl #endif #define XMLCDECL __cdecl - #if !defined _REENTRANT - #define _REENTRANT - #endif #endif /* Windows platform with Borland compiler */ @@ -97,9 +94,6 @@ #endif #define XMLCALL __cdecl #define XMLCDECL __cdecl - #if !defined _REENTRANT - #define _REENTRANT - #endif #endif /* Windows platform with GNU compiler (Mingw) */ @@ -126,9 +120,6 @@ #endif #define XMLCALL __cdecl #define XMLCDECL __cdecl - #if !defined _REENTRANT - #define _REENTRANT - #endif #endif /* Cygwin platform (does not define _WIN32), GNU compiler */ diff --git a/sdk/include/reactos/libs/libxml/xmlversion.h b/sdk/include/reactos/libs/libxml/xmlversion.h index 5ad5d8a3eb4..e235a5e584e 100644 --- a/sdk/include/reactos/libs/libxml/xmlversion.h +++ b/sdk/include/reactos/libs/libxml/xmlversion.h @@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.9.9" +#define LIBXML_DOTTED_VERSION "2.9.10" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20909 +#define LIBXML_VERSION 20910 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20909" +#define LIBXML_VERSION_STRING "20910" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-GITv2.9.9-rc2-2-g7c4949afa" +#define LIBXML_VERSION_EXTRA "-GITv2.9.10-rc1-2-ga5bb6aaa2" /** * LIBXML_TEST_VERSION: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20909); +#define LIBXML_TEST_VERSION xmlCheckVersion(20910); #ifndef VMS #if 0 @@ -91,11 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Whether the thread support is configured in */ #if 1 -#if defined(_REENTRANT) || defined(__MT__) || \ - (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) #define LIBXML_THREAD_ENABLED #endif -#endif /** * LIBXML_THREAD_ALLOC_ENABLED: @@ -291,7 +288,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether ISO-8859-* support is made available in case iconv is not */ -#if 0 +#if 1 #define LIBXML_ISO8859X_ENABLED #endif @@ -353,8 +350,10 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * LIBXML_EXPR_ENABLED: * * Whether the formal expressions interfaces are compiled in + * + * This code is unused and disabled unconditionally for now. */ -#if 1 +#if 0 #define LIBXML_EXPR_ENABLED #endif diff --git a/sdk/include/reactos/libs/libxml/xmlversion.h.in b/sdk/include/reactos/libs/libxml/xmlversion.h.in index d10f9754eac..964f10d81ab 100644 --- a/sdk/include/reactos/libs/libxml/xmlversion.h.in +++ b/sdk/include/reactos/libs/libxml/xmlversion.h.in @@ -91,11 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Whether the thread support is configured in */ #if @WITH_THREADS@ -#if defined(_REENTRANT) || defined(__MT__) || \ - (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) #define LIBXML_THREAD_ENABLED #endif -#endif /** * LIBXML_THREAD_ALLOC_ENABLED: @@ -353,8 +350,10 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * LIBXML_EXPR_ENABLED: * * Whether the formal expressions interfaces are compiled in + * + * This code is unused and disabled unconditionally for now. */ -#if @WITH_SCHEMAS@ +#if 0 #define LIBXML_EXPR_ENABLED #endif diff --git a/sdk/include/reactos/libs/libxml/xpath.h b/sdk/include/reactos/libs/libxml/xpath.h index d96776c5183..4ef3909b409 100644 --- a/sdk/include/reactos/libs/libxml/xpath.h +++ b/sdk/include/reactos/libs/libxml/xpath.h @@ -70,7 +70,9 @@ typedef enum { XPATH_INVALID_CHAR_ERROR, XPATH_INVALID_CTXT, XPATH_STACK_ERROR, - XPATH_FORBID_VARIABLE_ERROR + XPATH_FORBID_VARIABLE_ERROR, + XPATH_OP_LIMIT_EXCEEDED, + XPATH_RECURSION_LIMIT_EXCEEDED } xmlXPathError; /* @@ -82,7 +84,7 @@ struct _xmlNodeSet { int nodeNr; /* number of nodes in the set */ int nodeMax; /* size of the array as allocated */ xmlNodePtr *nodeTab; /* array of nodes in no particular order */ - /* @@ with_ns to check wether namespace nodes should be looked at @@ */ + /* @@ with_ns to check whether namespace nodes should be looked at @@ */ }; /* @@ -352,6 +354,13 @@ struct _xmlXPathContext { /* Cache for reusal of XPath objects */ void *cache; + + /* Resource limits */ + unsigned long opLimit; + unsigned long opCount; + int depth; + int maxDepth; + int maxParserDepth; }; /* diff --git a/sdk/lib/3rdparty/libxml2/ChangeLog b/sdk/lib/3rdparty/libxml2/ChangeLog index 896fbbb6538..b3f3fc1ff1b 100644 --- a/sdk/lib/3rdparty/libxml2/ChangeLog +++ b/sdk/lib/3rdparty/libxml2/ChangeLog @@ -463,7 +463,7 @@ Thu Jul 31 21:49:45 CEST 2008 Daniel Veillard <daniel(a)veillard.com> allow to make Name and NmToken validations based on the parser flags, more specifically the 5th edition of XML or not * HTMLparser.c tree.c: small side effects for the previous changes - * parser.c SAX2.c valid.c: the bulk of teh changes are here, + * parser.c SAX2.c valid.c: the bulk of the changes are here, the parser and validation behaviour can be affected, parsing flags need to be copied, lot of changes. Also fixing various validation problems in the regression tests. @@ -1328,7 +1328,7 @@ Wed Mar 21 14:23:08 HKT 2007 William Brack <wbrack(a)mmm.com.hk> Tue Mar 20 09:58:13 CET 2007 Daniel Veillard <daniel(a)veillard.com> * nanoftp.c: applied patch from Björn Wiberg to try to fix again - the silly __ss_familly problem on various AIXes, should fix #420184 + the silly __ss_family problem on various AIXes, should fix #420184 Wed Mar 14 20:30:38 HKT 2007 William Brack <wbrack(a)mmm.com.hk> @@ -1519,7 +1519,7 @@ Tue Oct 17 22:19:02 CEST 2006 Daniel Veillard <daniel(a)veillard.com> Tue Oct 17 22:04:31 CEST 2006 Daniel Veillard <daniel(a)veillard.com> - * HTMLparser.c: fixed teh 2 stupid bugs affecting htmlReadDoc() and + * HTMLparser.c: fixed the 2 stupid bugs affecting htmlReadDoc() and htmlReadIO() this should fix #340322 Tue Oct 17 21:39:23 CEST 2006 Daniel Veillard <daniel(a)veillard.com> @@ -1680,7 +1680,7 @@ Tue Oct 10 10:52:01 CEST 2006 Daniel Veillard <daniel(a)veillard.com> Tue Oct 10 10:33:43 CEST 2006 Daniel Veillard <daniel(a)veillard.com> * python/libxml.py python/types.c: applied patch from Ross Reedstrom, - Brian West and Stefan Anca to add XPointer suport to the Python bindings + Brian West and Stefan Anca to add XPointer support to the Python bindings Fri Sep 29 11:13:59 CEST 2006 Daniel Veillard <daniel(a)veillard.com> @@ -2022,7 +2022,7 @@ Tue May 30 11:21:34 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> * xpath.c: Enhanced xmlXPathNodeCollectAndTest() to avoid recreation (if possible) of the node-set which is used to - collect the nodes in the current axis for the currect context + collect the nodes in the current axis for the current context node. Especially for "//foo" this will decrease dramatically the number of created node-sets, since for each node in the result node-set of the evaluation of descendant-or-self::node() @@ -2056,7 +2056,7 @@ Wed May 24 10:54:25 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> xmlXPathNodeSetDupNs(); thus a pure memcpy is not possible. A flag on the node-set indicating if namespace nodes are in the set would help here; this is the 3rd flag which would - be usefull with node-sets. The current flags I have in mind: + be useful with node-sets. The current flags I have in mind: 1) Is a node-set already sorted? This would allow for rebust and optimizable sorting behaviour. @@ -2112,7 +2112,7 @@ Tue May 16 16:55:13 CEST 2006 Kasimier Buchcik <libxml2-cvs(a)cazic.net> compilation time (unlike normal XPath, where we can bind namespace names to prefixes at execution time). * pattern.c: Enhanced to use a string dict for local-names, - ns-prefixes and and namespace-names. + ns-prefixes and namespace-names. Fixed xmlStreamPushInternal() not to use string-pointer comparison if a dict is available; this won't work, since one does not know it the given strings originate from the @@ -2269,7 +2269,7 @@ Wed Mar 22 00:14:34 CET 2006 Daniel Veillard <daniel(a)veillard.com> Fri Mar 10 08:40:55 EST 2006 Daniel Veillard <daniel(a)veillard.com> * c14n.c encoding.c xmlschemas.c xpath.c xpointer.c: fix a few - warning raised by gcc-4.1 and latests changes + warning raised by gcc-4.1 and latest changes Fri Mar 10 01:34:42 CET 2006 Daniel Veillard <daniel(a)veillard.com> @@ -2967,12 +2967,12 @@ Mon Oct 10 15:12:43 CEST 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> Fixed default/fixed values for attributes (looks like they did not work in the last releases). Completed constraints for attribute uses. - Seperated attribute derivation from attribute constraints. + Separated attribute derivation from attribute constraints. Completed constraints for attribute group definitions. Disallowing <import>s of schemas in no target namespace if the importing schema is a chameleon schema. This contradicts the way Saxon, Xerces-J, XSV and IBM's SQC works, but the - W3C XML Schema WG, thinks it is correct to dissalow such + W3C XML Schema WG, thinks it is correct to disallow such imports. Added cos-all-limited constraints. Restructured reference resolution to model groups and element @@ -4980,7 +4980,7 @@ Thu Jan 27 13:39:04 CET 2005 Kasimier Buchcik <libxml2-cvs(a)cazic.net> modules. Added machanism to store element information for the ancestor-or-self axis; this is needed for identity-constraints - and should be helpfull for a future streamable validation. + and should be helpful for a future streamable validation. * include/libxml/xmlerror.h: Added an error code for identity-constraints. @@ -5639,7 +5639,7 @@ Tue Nov 2 15:49:34 CET 2004 Daniel Veillard <daniel(a)veillard.com> automatic API regression test tool. * SAX2.c nanoftp.c parser.c parserInternals.c tree.c xmlIO.c xmlstring.c: various API hardeing changes as a result of running - teh first set of automatic API regression tests. + the first set of automatic API regression tests. * test/slashdot16.xml: apparently missing from CVS, commited it Mon Nov 1 15:54:18 CET 2004 Daniel Veillard <daniel(a)veillard.com> @@ -5729,7 +5729,7 @@ Fri Oct 22 15:20:23 CEST 2004 Daniel Veillard <daniel(a)veillard.com> Fri Oct 22 21:04:20 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - * python/libxml.c: fixed a problem occuring only in x86_64 when + * python/libxml.c: fixed a problem occurring only in x86_64 when very large error messages are raised to the Python handlers. Thu Oct 21 18:03:21 CEST 2004 Daniel Veillard <daniel(a)veillard.com> @@ -5908,7 +5908,7 @@ Fri Sep 24 16:14:12 CEST 2004 Daniel Veillard <daniel(a)veillard.com> Thu Sep 23 18:23:46 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - * xmlschemastypes.c: fixing an out of bound adressing issue + * xmlschemastypes.c: fixing an out of bound addressing issue Thu Sep 23 15:14:12 CEST 2004 Daniel Veillard <daniel(a)veillard.com> @@ -6069,7 +6069,7 @@ Fri Sep 3 20:29:59 CEST 2004 Kasimier Buchcik <libxml2-cvs(a)cazic.net> of the wildcard. Added a check for circular attribute group references. Added a check for circular model group definition references. - Fixed a dublicate xmlParserErrors enum value - see bug #151738. + Fixed a duplicate xmlParserErrors enum value - see bug #151738. Fri Sep 3 10:08:13 PDT 2004 William Brack <wbrack(a)mmmm.com.hk> @@ -6275,7 +6275,7 @@ Mon Aug 16 02:42:30 CEST 2004 Daniel Veillard <daniel(a)veillard.com> include/libxml/xmlerror.h: cleanup to avoid 'error' identifier in includes #137414 * parser.c SAX2.c debugXML.c include/libxml/parser.h: - first version of the inplementation of parsing within + first version of the implementation of parsing within the context of a node in the tree #142359, new function xmlParseInNodeContext(), added support at the xmllint --shell level as the "set" function @@ -6938,7 +6938,7 @@ Sun May 9 20:40:59 CEST 2004 Daniel Veillard <daniel(a)veillard.com> Sun May 9 19:46:13 CEST 2004 Daniel Veillard <daniel(a)veillard.com> - * xmlsave.c: apply fix for XHTML1 formating from Nick Wellnhofer + * xmlsave.c: apply fix for XHTML1 formatting from Nick Wellnhofer fixes bug #141266 * test/xhtmlcomp result//xhtmlcomp*: added the specific regression test @@ -7753,7 +7753,7 @@ Fri Jan 23 14:03:21 CET 2004 Daniel Veillard <daniel(a)veillard.com> This is needed for XSLT to keep the stylesheet dictionary read-only while being able to reuse the strings for the transformation dictionary. - * xinclude.c: fixed a dictionary reference counting problem occuring + * xinclude.c: fixed a dictionary reference counting problem occurring when document parsing failed. * testSAX.c: adding option --repeat for timing 100times the parsing * doc/* : rebuilt all the docs @@ -8947,7 +8947,7 @@ Sun Oct 19 00:15:38 HKT 2003 William Brack <wbrack(a)mmm.com.hk> * include/libxml/parserInternals.h HTMLparser.c HTMLtree.c SAX2.c catalog.c debugXML.c entities.c parser.c relaxng.c testSAX.c tree.c valid.c xmlschemas.c xmlschemastypes.c - xpath.c: Changed all (?) occurences where validation macros + xpath.c: Changed all (?) occurrences where validation macros (IS_xxx) had single-byte arguments to use IS_xxx_CH instead (e.g. IS_BLANK changed to IS_BLANK_CH). This gets rid of many warning messages on certain platforms, and also high- @@ -8972,7 +8972,7 @@ Sat Oct 18 11:04:32 CEST 2003 Daniel Veillard <daniel(a)veillard.com> a new source, like the xmlReadxx and xmlCtxtReadxxx * win32/libxml2.def.src doc/libxml2-api.xml doc/apibuild.py doc/Makefile.am: regenerated the APIs - * doc/xml.html: applied a patch from Stefan Kost for namesapce docs + * doc/xml.html: applied a patch from Stefan Kost for namespace docs Sat Oct 18 12:46:02 HKT 2003 William Brack <wbrack(a)mmm.com.hk> @@ -9179,7 +9179,7 @@ Tue Oct 7 23:19:39 CEST 2003 Daniel Veillard <daniel(a)veillard.com> on Windows from Jesse Pelton * parser.c: tiny safety patch for xmlStrPrintf() make sure the return is always zero terminated. Should also help detecting - passing wrong buffer size easilly. + passing wrong buffer size easily. * result/VC/* result/valid/rss.xml.err result/valid/xlink.xml.err: updated the results to follow the errors string generated by last commit. @@ -9192,7 +9192,7 @@ Tue Oct 7 14:16:45 CEST 2003 Daniel Veillard <daniel(a)veillard.com> Tue Oct 7 13:30:39 CEST 2003 Daniel Veillard <daniel(a)veillard.com> * error.c relaxng.c include/libxml/xmlerror.h: switched Relax-NG - module to teh new error reporting. Better default report, adds + module to the new error reporting. Better default report, adds the element associated if found, context and node are included in the xmlError * python/tests/reader2.py: the error messages changed. @@ -10424,7 +10424,7 @@ Fri Jun 13 14:27:19 CEST 2003 Daniel Veillard <daniel(a)veillard.com> * doc/Makefile.am doc/html/*: reverted back patch for #113521, due to #115104 and while fixing #115101 . HTML URLs must not - be version dependant. + be version dependent. Fri Jun 13 12:03:30 CEST 2003 Daniel Veillard <daniel(a)veillard.com> @@ -10627,7 +10627,7 @@ Sat Apr 26 14:00:58 CEST 2003 Daniel Veillard <daniel(a)veillard.com> * python/generator.py: fixed a problem in the generator where the way functions are remapped as methods on classes was - not symetric and dependant on python internal hash order, + not symmetric and dependent on python internal hash order, as reported by Stéphane Bidoul Fri Apr 25 21:52:33 MDT 2003 John Fleck <jfleck(a)inkstain.net> @@ -11162,7 +11162,7 @@ Tue Mar 18 01:28:15 CET 2003 Daniel Veillard <daniel(a)veillard.com> Mon Mar 17 16:34:07 CET 2003 Daniel Veillard <daniel(a)veillard.com> * relaxng.c: fixed the last core RelaxNG bug known #107083, - shemas datatype ID/IDREF support still missing though. + schemas datatype ID/IDREF support still missing though. * xmlreader.c: fix a crashing bug with prefix raised by Merijn Broeren * test/relaxng/testsuite.xml: augmented the testsuite with @@ -11882,7 +11882,7 @@ Fri Jan 10 13:47:55 CET 2003 Daniel Veillard <daniel(a)veillard.com> Fri Jan 10 00:16:49 CET 2003 Daniel Veillard <daniel(a)veillard.com> - * parser.c: one more IsEmptyElement crazyness, that time in + * parser.c: one more IsEmptyElement craziness, that time in external parsed entities if substitution is asked. * python/tests/reader3.py: added a specific test. @@ -12145,7 +12145,7 @@ Wed Dec 25 19:22:06 MST 2002 John Fleck <jfleck(a)inkstain.net> Mon Dec 23 16:54:22 CET 2002 Daniel Veillard <daniel(a)veillard.com> * xmlreader.c: Fixed the empty node detection to avoid reporting - an inexistant close tag. + an nonexistent close tag. Mon Dec 23 15:42:24 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -12482,7 +12482,7 @@ Sat Nov 16 16:30:25 CET 2002 Daniel Veillard <daniel(a)veillard.com> * parser.c xpath.c: fixing #96925 wich was also dependent on the processing of parsed entities, and XPath computation on sustitued entities. - * testXPath.c: make sure entities are substitued. + * testXPath.c: make sure entities are substituted. Fri Nov 15 16:22:54 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -12673,7 +12673,7 @@ Tue Oct 22 16:23:57 CEST 2002 Daniel Veillard <daniel(a)veillard.com> Mon Oct 21 09:57:10 CEST 2002 Daniel Veillard <daniel(a)veillard.com> * parser.c: tried to fix bug #91500 where doc->children may - be overriden by a call to xmlParseBalancedChunkMemory() + be overridden by a call to xmlParseBalancedChunkMemory() Mon Oct 21 09:04:32 CEST 2002 Daniel Veillard <daniel(a)veillard.com> @@ -12800,7 +12800,7 @@ Thu Sep 26 19:48:06 CEST 2002 Daniel Veillard <daniel(a)veillard.com> * configure.in include/libxml/xmlwin32version.h: preparing release of 2.4.25 - * doc/*: updated and regenerated teh docs and web pages. + * doc/*: updated and regenerated the docs and web pages. Thu Sep 26 17:33:46 CEST 2002 Daniel Veillard <daniel(a)veillard.com> @@ -13026,7 +13026,7 @@ Thu Sep 5 10:07:13 CEST 2002 Daniel Veillard <daniel(a)veillard.com> Wed Sep 4 14:13:34 CEST 2002 Daniel Veillard <daniel(a)veillard.com> - * libxml.spec.in: fixes libary path for x86_64 AMD + * libxml.spec.in: fixes library path for x86_64 AMD Tue Sep 3 21:14:19 MDT 2002 John Fleck <jfleck(a)inkstain.net> @@ -13085,7 +13085,7 @@ Thu Aug 22 16:19:42 CEST 2002 Daniel Veillard <daniel(a)veillard.com> Thu Aug 22 11:45:50 CEST 2002 Daniel Veillard <daniel(a)veillard.com> * python/Makefile.am: typo in target name resulted in libxml2.py - to not be rebuilt. fixed DESTDIR similary to the libxslt one. + to not be rebuilt. fixed DESTDIR similarly to the libxslt one. Thu Aug 22 09:15:00 CEST 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14044,7 +14044,7 @@ Thu Mar 7 16:11:35 CET 2002 Daniel Veillard <daniel(a)veillard.com> Thu Mar 7 12:19:36 CET 2002 Daniel Veillard <daniel(a)veillard.com> * configure.in xmllint.c: trying to fix #71457 for timing - precision when gettimeofday() is not availble but ftime() is + precision when gettimeofday() is not available but ftime() is Thu Mar 7 11:24:02 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14208,7 +14208,7 @@ Tue Feb 19 22:01:35 CET 2002 Daniel Veillard <daniel(a)veillard.com> when a document is standalone seems correctly handled. There is a couple of open issues left which need consideration especially PE93 on external unparsed entities and standalone status. - Ran 1819 tests: 1817 suceeded, 2 failed and 0 generated an error in 8.26 s. + Ran 1819 tests: 1817 succeeded, 2 failed and 0 generated an error in 8.26 s. The 2 tests left failing are actually in error. Cleanup done. Tue Feb 19 15:17:02 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14225,7 +14225,7 @@ Mon Feb 18 23:25:08 CET 2002 Daniel Veillard <daniel(a)veillard.com> * parser.c valid.c: a couple of errors were reported but not saved back as such in the parsing context. Down to 1% failure rate - Ran 1819 tests: 1801 suceeded, 18 failed and 0 generated an error + Ran 1819 tests: 1801 succeeded, 18 failed and 0 generated an error Mon Feb 18 20:16:15 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14266,7 +14266,7 @@ Sun Feb 17 23:45:40 CET 2002 Daniel Veillard <daniel(a)veillard.com> * check-xml-test-suite.py: improved the behaviour a bit as well as the logs * parser.c valid.c SAX.c: fixed a few more bugs - "Ran 1819 tests: 1778 suceeded, 41 failed, and 0 generated an error" + "Ran 1819 tests: 1778 succeeded, 41 failed, and 0 generated an error" Sun Feb 17 20:41:37 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14453,7 +14453,7 @@ Sun Feb 3 17:50:46 CET 2002 Daniel Veillard <daniel(a)veillard.com> context, allow to switch on and check validity * python/tests/Makefile.am python/tests/error.py python/tests/invalid.xml python/tests/valid.xml - python/tests/validate.py: attded more test and and added error.py + python/tests/validate.py: added more test and added error.py which I forgot to commit in the last step Sun Feb 3 16:03:55 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14576,7 +14576,7 @@ Wed Jan 23 18:53:55 CET 2002 Daniel Veillard <daniel(a)veillard.com> Wed Jan 23 15:14:22 CET 2002 Daniel Veillard <daniel(a)veillard.com> * parserInternals.h: Greg Sjaardema suggested to use an - eponential buffer groth policy in xmlParserAddNodeInfo() + exponential buffer growth policy in xmlParserAddNodeInfo() Wed Jan 23 13:32:40 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -14660,7 +14660,7 @@ Sat Jan 19 16:36:21 CET 2002 Bjorn Reese <breese(a)users.sourceforge.net> Fri Jan 18 17:22:50 CET 2002 Daniel Veillard <daniel(a)veillard.com> - * globals.c xmlIO.c xmlcatalog.c: removed the last occurences + * globals.c xmlIO.c xmlcatalog.c: removed the last occurrences of strdup usage in the code Fri Jan 18 12:47:15 CET 2002 Daniel Veillard <daniel(a)veillard.com> @@ -15488,7 +15488,7 @@ Wed Sep 12 16:58:16 CEST 2001 Daniel Veillard <daniel(a)veillard.com> Tue Sep 11 11:25:36 CEST 2001 Daniel Veillard <daniel(a)veillard.com> * parser.c result/noent/wml.xml: fixed bug #59981 related - to handling of '&' in attributes when entities are substitued + to handling of '&' in attributes when entities are substituted Mon Sep 10 22:14:42 CEST 2001 Daniel Veillard <daniel(a)veillard.com> @@ -16120,7 +16120,7 @@ Tue Jun 26 18:05:26 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> * configure.in doc/xml.html include/libxml/xmlwin32version.h: release of 2.3.12 - * parser.c: make an error message if unknow entities in all cases + * parser.c: make an error message if unknown entities in all cases Tue Jun 26 09:46:29 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> @@ -16943,7 +16943,7 @@ Wed Apr 18 17:09:15 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> Wed Apr 18 15:06:30 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> * debugXML.c hash.c tree.h valid.c : some changes related to - the validation suport to improve speed with DocBook + the validation support to improve speed with DocBook * result/VC/OneID2 result/VC/OneID3 : this slightly changes the way validation errors get reported @@ -17003,7 +17003,7 @@ Tue Apr 10 18:13:10 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> * xpath.c: trying to get 52979 solved * tree.c result/ result/noent/: trying to get 52712 solved, this also made me clean up the fact that XML output in general should - not add formating blanks by default, this changed the output of + not add formatting blanks by default, this changed the output of a few tests Tue Apr 10 16:30:20 CEST 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> @@ -17219,7 +17219,7 @@ Wed Mar 7 20:43:47 CET 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> * parser.c SAX.c: the new content parsing code raised an ugly bug in the characters() SAX callback. Found it - just because of strangeness in XSLT XML Rec ouptut :-( + just because of strangeness in XSLT XML Rec output :-( Wed Mar 7 16:50:22 CET 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> @@ -17541,13 +17541,13 @@ Mon Jan 22 16:30:37 CET 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> Mon Jan 22 11:43:21 CET 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> - * xpath.c: when copying a XSLT tree object teh tree need to be copied + * xpath.c: when copying a XSLT tree object the tree need to be copied too, and deallocation need to occur the same way. Mon Jan 22 10:35:40 CET 2001 Daniel Veillard <Daniel.Veillard(a)imag.fr> * xpathInternals.h xpath.[ch] debugXML.c: added the XPATH_XSLT_TREE - type correponding to an XSLT result tree fragment. Share most + type corresponding to an XSLT result tree fragment. Share most of the data format with node set, as well as operators. * HTMLtree.c: added a newline at the end of the doctype output whe this one is not present initially. @@ -17904,7 +17904,7 @@ Sun Oct 15 22:28:32 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> Sun Oct 15 16:21:27 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> * SAX.c: HTML attributes need normalization too (Bjorn Reese) - * HTMLparser.[ch]: addded htmlIsScriptAttribute() + * HTMLparser.[ch]: added htmlIsScriptAttribute() Sun Oct 15 13:18:36 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> @@ -18010,7 +18010,7 @@ Wed Oct 11 02:53:10 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> * include/Makefile.am include/win32config.h: new directory for includes * win32/Makefile.mingw win32/README.MSDev win32/libxml2/libxml2.dsp - updated teh makefiles and instructions for WIN32 + updated the makefiles and instructions for WIN32 * xpath.c: small fixes * test/XPath/ results/XPath: updated the testcases and results * HTMLparser.c nanohttp.c testXPath.c: incorporated provided or @@ -18255,7 +18255,7 @@ Mon Aug 28 11:58:12 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> patches from Wayne Davison <wayned(a)users.sourceforge.net>, adding htmlEncodeEntities() * HTMLparser.c: fixed an ignorable white space detection bug - occuring when parsing with SAX only + occurring when parsing with SAX only * result/HTML/*.sax: updated since the output is now HTML encoded... @@ -18420,7 +18420,7 @@ Fri Jul 14 16:12:20 MEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> when using Sun Pro cc compiler * xpath.c : cleanup memleaks * nanoftp.c : added a TESTING preprocessor flag for standalong - compile so that people can report bugs more easilly + compile so that people can report bugs more easily * nanohttp.c : ditched socklen_t which was a portability mess and replaced it with unsigned int. * tree.[ch]: added xmlHasProp() @@ -18594,7 +18594,7 @@ Mon Apr 3 21:47:10 CEST 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> Makefile.am : added compile-time customization of libxml --with-ftp --with-http --with-html --with-xpath --with-debug --with-mem-debug - * *.[ch] autoconf.sh : moved to an absolute adressing of includes : + * *.[ch] autoconf.sh : moved to an absolute addressing of includes : #include <libxml/xxx.h> I hope it won't break too much stuff and will be manageable in the future... * xmllint.c Makefile.am libxml.spec.in : renamed tester.c to xmllint.c @@ -18625,7 +18625,7 @@ Mon Mar 20 12:33:51 CET 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> libxml default allocation function with another set (like gmalloc/ gfree). * Makefile.am, uri.c, uri.h: added a set of functions to do - exact (litteraly copied from the RFC 2396 productions) parsing + exact (literally copied from the RFC 2396 productions) parsing and handling of URI. Will be needed for XLink, one XML WFC, XML Base and reused in the nano[ftp/http] modules. Still work to be done. @@ -18688,7 +18688,7 @@ Thu Feb 3 15:59:37 CET 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> * nanoftp.c nanohttp.c tree.c HTMLtree.[ch] debugXML.c xpath.c: Fixed compilation warnings on various platforms. - * parser.c: Fixed #5281 validity error callbacks are now desactived + * parser.c: Fixed #5281 validity error callbacks are now deactivated by default if not validating. Thu Feb 3 13:46:14 CET 2000 Daniel Veillard <Daniel.Veillard(a)w3.org> @@ -19125,7 +19125,7 @@ Wed Sep 22 11:40:31 CEST 1999 Daniel Veillard <Daniel.Veillard(a)w3.org> * parser.h: modified the parser context struct to regain 1.4.0 binary compatibility - * parser.c, xml-error.h: added errno ot teh context and defined + * parser.c, xml-error.h: added errno to the context and defined a set of errors values with update of errno * nanohttp.[ch]: minimalist HTTP front-end for fetching remote DTDs and entities @@ -19562,7 +19562,7 @@ Tue Oct 27 01:15:39 EST 1998 Daniel Veillard <Daniel.Veillard(a)w3.org> Sat Oct 24 14:23:51 EDT 1998 Daniel Veillard <Daniel.Veillard(a)w3.org> - * parser.c: Set up the fonctions comment block, boring but useful. + * parser.c: Set up the functions comment block, boring but useful. * parser.h, SAX.c, parser.c: now attributes are processed through the SAX interface. The problem is that my SAX interface diverged quite a bit from the original one, well this is not an official @@ -19571,7 +19571,7 @@ Sat Oct 24 14:23:51 EDT 1998 Daniel Veillard <Daniel.Veillard(a)w3.org> Tue Oct 20 02:11:21 EDT 1998 Daniel Veillard <Daniel.Veillard(a)w3.org> * SAX.c, entities.c, tree.c, encoding.c, error.c: Set up the - fonctions comment block, boring but useful. + functions comment block, boring but useful. Sun Oct 18 20:40:58 EDT 1998 Daniel Veillard <Daniel.Veillard(a)w3.org> diff --git a/sdk/lib/3rdparty/libxml2/HTMLparser.c b/sdk/lib/3rdparty/libxml2/HTMLparser.c index 9e60e27ec1c..7b6d68961c4 100644 --- a/sdk/lib/3rdparty/libxml2/HTMLparser.c +++ b/sdk/lib/3rdparty/libxml2/HTMLparser.c @@ -317,7 +317,7 @@ htmlNodeInfoPop(htmlParserCtxtPtr ctxt) #define SKIP_BLANKS htmlSkipBlankChars(ctxt) -/* Inported from XML */ +/* Imported from XML */ /* #define CUR (ctxt->token ? ctxt->token : (int) (*ctxt->input->cur)) */ #define CUR ((int) (*ctxt->input->cur)) @@ -537,7 +537,7 @@ htmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) { encoding_error: /* * If we detect an UTF8 error that probably mean that the - * input encoding didn't get properly advertized in the + * input encoding didn't get properly advertised in the * declaration header. Report the error and switch the encoding * to ISO-Latin-1 (if you don't like this policy, just declare the * encoding !) @@ -602,8 +602,8 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) { ************************************************************************/ /* - * Start Tag: 1 means the start tag can be ommited - * End Tag: 1 means the end tag can be ommited + * Start Tag: 1 means the start tag can be omitted + * End Tag: 1 means the end tag can be omitted * 2 means it's forbidden (empty elements) * 3 means the tag is stylistic and should be closed easily * Depr: this element is deprecated @@ -1342,7 +1342,7 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag) if (xmlStrEqual(newtag, ctxt->nameTab[i])) break; /* - * A missplaced endtag can only close elements with lower + * A misplaced endtag can only close elements with lower * or equal priority, so if we find an element with higher * priority before we find an element with * matching name, we just ignore this endtag @@ -2176,6 +2176,7 @@ htmlEncodeEntities(unsigned char* out, int *outlen, * * ************************************************************************/ +#ifdef LIBXML_PUSH_ENABLED /** * htmlNewInputStream: * @ctxt: an HTML parser context @@ -2207,6 +2208,7 @@ htmlNewInputStream(htmlParserCtxtPtr ctxt) { input->length = 0; return(input); } +#endif /************************************************************************ @@ -2216,9 +2218,9 @@ htmlNewInputStream(htmlParserCtxtPtr ctxt) { ************************************************************************/ /* * all tags allowing pc data from the html 4.01 loose dtd - * NOTE: it might be more apropriate to integrate this information + * NOTE: it might be more appropriate to integrate this information * into the html40ElementTable array but I don't want to risk any - * binary incomptibility + * binary incompatibility */ static const char *allowPCData[] = { "a", "abbr", "acronym", "address", "applet", "b", "bdo", "big", @@ -2959,6 +2961,7 @@ htmlParseScript(htmlParserCtxtPtr ctxt) { } COPY_BUF(l,buf,nbchar,cur); if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { + buf[nbchar] = 0; if (ctxt->sax->cdataBlock!= NULL) { /* * Insert as CDATA, which is the same as HTML_PRESERVE_NODE @@ -2983,6 +2986,7 @@ htmlParseScript(htmlParserCtxtPtr ctxt) { } if ((nbchar != 0) && (ctxt->sax != NULL) && (!ctxt->disableSAX)) { + buf[nbchar] = 0; if (ctxt->sax->cdataBlock!= NULL) { /* * Insert as CDATA, which is the same as HTML_PRESERVE_NODE @@ -3028,6 +3032,8 @@ htmlParseCharDataInternal(htmlParserCtxtPtr ctxt, int readahead) { COPY_BUF(l,buf,nbchar,cur); } if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { + buf[nbchar] = 0; + /* * Ok the segment is to be consumed as chars. */ @@ -5762,13 +5768,13 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { break; } case XML_PARSER_CONTENT: { + xmlChar chr[2] = { 0, 0 }; long cons; + /* * Handle preparsed entities and charRef */ if (ctxt->token != 0) { - xmlChar chr[2] = { 0 , 0 } ; - chr[0] = (xmlChar) ctxt->token; htmlCheckParagraph(ctxt); if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL)) @@ -5780,21 +5786,22 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { cur = in->cur[0]; if ((cur != '<') && (cur != '&')) { if (ctxt->sax != NULL) { + chr[0] = cur; if (IS_BLANK_CH(cur)) { if (ctxt->keepBlanks) { if (ctxt->sax->characters != NULL) ctxt->sax->characters( - ctxt->userData, &in->cur[0], 1); + ctxt->userData, chr, 1); } else { if (ctxt->sax->ignorableWhitespace != NULL) ctxt->sax->ignorableWhitespace( - ctxt->userData, &in->cur[0], 1); + ctxt->userData, chr, 1); } } else { htmlCheckParagraph(ctxt); if (ctxt->sax->characters != NULL) ctxt->sax->characters( - ctxt->userData, &in->cur[0], 1); + ctxt->userData, chr, 1); } } ctxt->token = 0; diff --git a/sdk/lib/3rdparty/libxml2/HTMLtree.c b/sdk/lib/3rdparty/libxml2/HTMLtree.c index 21cfcfe591e..db63b371f06 100644 --- a/sdk/lib/3rdparty/libxml2/HTMLtree.c +++ b/sdk/lib/3rdparty/libxml2/HTMLtree.c @@ -1048,7 +1048,7 @@ htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, * @cur: the document * @encoding: the encoding string * - * Dump an HTML document. Formating return/spaces are added. + * Dump an HTML document. Formatting return/spaces are added. */ void htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, diff --git a/sdk/lib/3rdparty/libxml2/NEWS b/sdk/lib/3rdparty/libxml2/NEWS index d248c6936f5..b55c63b2c6b 100644 --- a/sdk/lib/3rdparty/libxml2/NEWS +++ b/sdk/lib/3rdparty/libxml2/NEWS @@ -8,8 +8,451 @@ The change log at ChangeLog.html describes the recents commits to the GIT at -http://git.gnome.org/browse/libxml2/ +https://gitlab.gnome.org/GNOME/libxml2 code base.Here is the list of public releases: +v2.9.9: Jan 03 2019: + - Security: + CVE-2018-9251 CVE-2018-14567 Fix infinite loop in LZMA decompression (Nick Wellnhofer), + CVE-2018-14404 Fix nullptr deref with XPath logic ops (Nick Wellnhofer), + + - Documentation: + reader: Fix documentation comment (Mohammed Sadiq) + + - Portability: + Fix MSVC build with lzma (Nick Wellnhofer), + Variables need 'extern' in static lib on Cygwin (Michael Haubenwallner), + Really declare dllexport/dllimport for Cygwin (Michael Haubenwallner), + Merge branch 'patch-2' into 'master' (Nick Wellnhofer), + Change dir to $THEDIR after ACLOCAL_PATH check autoreconf creates aclocal.m4 in $srcdir (Vitaly Buka), + Improve error message if pkg.m4 couldn't be found (Nick Wellnhofer), + NaN and Inf fixes for pre-C99 compilers (Nick Wellnhofer) + + - Bug Fixes: + Revert "Support xmlTextReaderNextSibling w/o preparsed doc" (Nick Wellnhofer), + Fix building relative URIs (Thomas Holder), + Problem with data in interleave in RelaxNG validation (Nikolai Weibull), + Fix memory leak in xmlSwitchInputEncodingInt error path (Nick Wellnhofer), + Set doc on element obtained from freeElems (Nick Wellnhofer), + Fix HTML serialization with UTF-8 encoding (Nick Wellnhofer), + Use actual doc in xmlTextReaderRead*Xml (Nick Wellnhofer), + Unlink node before freeing it in xmlSAX2StartElement (Nick Wellnhofer), + Check return value of nodePush in xmlSAX2StartElement (Nick Wellnhofer), + Free input buffer in xmlHaltParser (Nick Wellnhofer), + Reset HTML parser input pointers on encoding failure (Nick Wellnhofer), + Don't run icu_parse_test if EUC-JP is unsupported (Nick Wellnhofer), + Fix xmlSchemaValidCtxtPtr reuse memory leak (Greg Hildstrom), + Fix xmlTextReaderNext with preparsed document (Felix Bünemann), + Remove stray character from comment (Nick Wellnhofer), + Remove a misleading line from xmlCharEncOutput (Andrey Bienkowski), + HTML noscript should not close p (Daniel Veillard), + Don't change context node in xmlXPathRoot (Nick Wellnhofer), + Stop using XPATH_OP_RESET (Nick Wellnhofer), + Revert "Change calls to xmlCharEncInput to set flush false" (Nick Wellnhofer) + + - Improvements: + Fix "Problem with data in interleave in RelaxNG validation" (Nikolai Weibull), + cleanup: remove some unreachable code (Thomas Holder), + add --relative to testURI (Thomas Holder), + Remove redefined starts and defines inside include elements (Nikolai Weibull), + Allow choice within choice in nameClass in RELAX NG (Nikolai Weibull), + Look inside divs for starts and defines inside include (Nikolai Weibull), + Add compile and libxml2-config.cmake to .gitignore (Nikolai Weibull), + Stop using doc->charset outside parser code (Nick Wellnhofer), + Add newlines to 'xmllint --xpath' output (Nick Wellnhofer), + Don't include SAX.h from globals.h (Nick Wellnhofer), + Support xmlTextReaderNextSibling w/o preparsed doc (Felix Bünemann), + Don't instruct user to run make when autogen.sh failed (林博仁(Buo-ren Lin)), + Run Travis ASan tests with "sudo: required" (Nick Wellnhofer), + Improve restoring of context size and position (Nick Wellnhofer), + Simplify and harden nodeset filtering (Nick Wellnhofer), + Avoid unnecessary backups of the context node (Nick Wellnhofer), + Fix inconsistency in xmlXPathIsInf (Nick Wellnhofer) + + - Cleanups: + + + +v2.9.8: Mar 05 2018: + - Portability: + python: remove single use of _PyVerify_fd (Patrick Welche), + Build more test executables on Windows/MSVC (Nick Wellnhofer), + Stop including ansidecl.h (Nick Wellnhofer), + Fix libz and liblzma detection (Nick Wellnhofer), + Revert "Compile testapi with -Wno-unused-function" (Nick Wellnhofer) + + - Bug Fixes: + Fix xmlParserEntityCheck (Nick Wellnhofer), + Halt parser in case of encoding error (Nick Wellnhofer), + Clear entity content in case of errors (Nick Wellnhofer), + Change calls to xmlCharEncInput to set flush false when not final call. Having flush incorrectly set to true causes errors for ICU. (Joel Hockey), + Fix buffer over-read in xmlParseNCNameComplex (Nick Wellnhofer), + Fix ICU library filenames on Windows/MSVC (Nick Wellnhofer), + Fix xmlXPathIsNaN broken by recent commit (Nick Wellnhofer), + Fix -Wenum-compare warnings (Nick Wellnhofer), + Fix callback signature in testapi.c (Nick Wellnhofer), + Fix unused parameter warning without ICU (Nick Wellnhofer), + Fix IO callback signatures (Nick Wellnhofer), + Fix misc callback signatures (Nick Wellnhofer), + Fix list callback signatures (Nick Wellnhofer), + Fix hash callback signatures (Nick Wellnhofer), + Refactor name and type signature for xmlNop (Vlad Tsyrklevich), + Fixed ICU to set flush correctly and provide pivot buffer. (Joel Hockey), + Skip EBCDIC tests if EBCDIC isn't supported (Nick Wellnhofer) + + - Improvements: + Disable pointer-overflow UBSan checks under Travis (Nick Wellnhofer), + Improve handling of context input_id (Daniel Veillard), + Add resource file to Windows DLL (ccpaging), + Run Travis tests with -Werror (Nick Wellnhofer), + Build with "-Wall -Wextra" (Nick Wellnhofer), + Fix -Wtautological-pointer-compare warnings (Nick Wellnhofer), + Remove unused AC_CHECKs (Nick Wellnhofer), + Update information about contributing (Nick Wellnhofer), + Fix -Wmisleading-indentation warnings (Nick Wellnhofer), + Don't touch CFLAGS in configure.ac (Nick Wellnhofer), + Ignore function pointer cast warnings (Nick Wellnhofer), + Simplify XPath NaN, inf and -0 handling (Nick Wellnhofer), + Introduce xmlPosixStrdup and update xmlMemStrdup (Nick Wellnhofer), + Add test for ICU flush and pivot buffer (Nick Wellnhofer), + Compile testapi with -Wno-unused-function (Nick Wellnhofer) + + + +2.9.7: Nov 02 2017: + - Documentation: + xmlcatalog: refresh man page wrt. quering system catalog easily (Jan Pokorný) + + - Portability: + Fix deprecated Travis compiler flag (Nick Wellnhofer), + Add declaration for DllMain (J. Peter Mugaas), + Fix preprocessor conditional in threads.h (J. Peter Mugaas), + Fix pointer comparison warnings on 64-bit Windows (J. Peter Mugaas), + Fix macro redefinition warning (J. Peter Mugaas), + Default to native threads on MinGW-w64 (Nick Wellnhofer), + Simplify Windows IO functions (Nick Wellnhofer), + Fix runtest on Windows (Nick Wellnhofer), + socklen_t is always int on Windows (Nick Wellnhofer), + Don't redefine socket error codes on Windows (Nick Wellnhofer), + Fix pointer/int cast warnings on 64-bit Windows (Nick Wellnhofer), + Fix Windows compiler warnings in xmlCanonicPath (Nick Wellnhofer) + + - Bug Fixes: + xmlcatalog: restore ability to query system catalog easily (Jan Pokorný), + Fix comparison of nodesets to strings (Nick Wellnhofer) + + - Improvements: + Add Makefile rules to rebuild HTML man pages (Nick Wellnhofer), + Fix mixed decls and code in timsort.h (Nick Wellnhofer), + Rework handling of return values in thread tests (Nick Wellnhofer), + Fix unused variable warnings in testrecurse (Nick Wellnhofer), + Fix -Wimplicit-fallthrough warnings (J. Peter Mugaas), + Upgrade timsort.h to latest revision (Nick Wellnhofer), + Increase warning level to /W3 under MSVC (Nick Wellnhofer), + Fix a couple of warnings in dict.c and threads.c (Nick Wellnhofer), + Update .gitignore for Windows (Nick Wellnhofer), + Fix unused variable warnings in nanohttp.c (Nick Wellnhofer), + Fix the Windows header mess (Nick Wellnhofer), + Don't include winsock2.h in xmllint.c (Nick Wellnhofer), + Remove generated file python/setup.py from version control (Nick Wellnhofer), + Use __linux__ macro in generated code (Nick Wellnhofer) + + + +v2.9.6: Oct 06 2017: + - Portability: + Change preprocessor OS tests to __linux__ (Nick Wellnhofer) + + - Bug Fixes: + Fix XPath stack frame logic (Nick Wellnhofer), + Report undefined XPath variable error message (Nick Wellnhofer), + Fix regression with librsvg (Nick Wellnhofer), + Handle more invalid entity values in recovery mode (Nick Wellnhofer), + Fix structured validation errors (Nick Wellnhofer), + Fix memory leak in LZMA decompressor (Nick Wellnhofer), + Set memory limit for LZMA decompression (Nick Wellnhofer), + Handle illegal entity values in recovery mode (Nick Wellnhofer), + Fix debug dump of streaming XPath expressions (Nick Wellnhofer), + Fix memory leak in nanoftp (Nick Wellnhofer), + Fix memory leaks in SAX1 parser (Nick Wellnhofer) + + + +v2.9.5: Sep 04 2017: + - Security: + Detect infinite recursion in parameter entities (Nick Wellnhofer), + Fix handling of parameter-entity references (Nick Wellnhofer), + Disallow namespace nodes in XPointer ranges (Nick Wellnhofer), + Fix XPointer paths beginning with range-to (Nick Wellnhofer) + + - Documentation: + Documentation fixes (Nick Wellnhofer), + Spelling and grammar fixes (Nick Wellnhofer) + + - Portability: + Adding README.zOS to list of extra files for the release (Daniel Veillard), + Description of work needed to compile on zOS (Stéphane Michaut), + Porting libxml2 on zOS encoding of code (Stéphane Michaut), + small changes for OS/400 (Patrick Monnerat), + relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers (Chun-wei Fan) + + - Bug Fixes: + Problem resolving relative URIs (Daniel Veillard), + Fix unwanted warnings when switching encodings (Nick Wellnhofer), + Fix signature of xmlSchemaAugmentImportedIDC (Daniel Veillard), + Heap-buffer-overflow read of size 1 in xmlFAParsePosCharGroup (David Kilzer), + Fix NULL pointer deref in xmlFAParseCharClassEsc (Nick Wellnhofer), + Fix infinite loops with push parser in recovery mode (Nick Wellnhofer), + Send xmllint usage error to stderr (Nick Wellnhofer), + Fix NULL deref in xmlParseExternalEntityPrivate (Nick Wellnhofer), + Make sure not to call IS_BLANK_CH when parsing the DTD (Nick Wellnhofer), + Fix xmlHaltParser (Nick Wellnhofer), + Fix pathological performance when outputting charrefs (Nick Wellnhofer), + Fix invalid-source-encoding warnings in testWriter.c (Nick Wellnhofer), + Fix duplicate SAX callbacks for entity content (David Kilzer), + Treat URIs with scheme as absolute in C14N (Nick Wellnhofer), + Fix copy-paste errors in error messages (Nick Wellnhofer), + Fix sanity check in htmlParseNameComplex (Nick Wellnhofer), + Fix potential infinite loop in xmlStringLenDecodeEntities (Nick Wellnhofer), + Reset parser input pointers on encoding failure (Nick Wellnhofer), + Fix memory leak in xmlParseEntityDecl error path (Nick Wellnhofer), + Fix xmlBuildRelativeURI for URIs starting with './' (Nick Wellnhofer), + Fix type confusion in xmlValidateOneNamespace (Nick Wellnhofer), + Fix memory leak in xmlStringLenGetNodeList (Nick Wellnhofer), + Fix NULL pointer deref in xmlDumpElementContent (Daniel Veillard), + Fix memory leak in xmlBufAttrSerializeTxtContent (Nick Wellnhofer), + Stop parser on unsupported encodings (Nick Wellnhofer), + Check for integer overflow in memory debug code (Nick Wellnhofer), + Fix buffer size checks in xmlSnprintfElementContent (Nick Wellnhofer), + Avoid reparsing in xmlParseStartTag2 (Nick Wellnhofer), + Fix undefined behavior in xmlRegExecPushStringInternal (Nick Wellnhofer), + Check XPath exponents for overflow (Nick Wellnhofer), + Check for overflow in xmlXPathIsPositionalPredicate (Nick Wellnhofer), + Fix spurious error message (Nick Wellnhofer), + Fix memory leak in xmlCanonicPath (Nick Wellnhofer), + Fix memory leak in xmlXPathCompareNodeSetValue (Nick Wellnhofer), + Fix memory leak in pattern error path (Nick Wellnhofer), + Fix memory leak in parser error path (Nick Wellnhofer), + Fix memory leaks in XPointer error paths (Nick Wellnhofer), + Fix memory leak in xmlXPathNodeSetMergeAndClear (Nick Wellnhofer), + Fix memory leak in XPath filter optimizations (Nick Wellnhofer), + Fix memory leaks in XPath error paths (Nick Wellnhofer), + Do not leak the new CData node if adding fails (David Tardon), + Prevent unwanted external entity reference (Neel Mehta), + Increase buffer space for port in HTTP redirect support (Daniel Veillard), + Fix more NULL pointer derefs in xpointer.c (Nick Wellnhofer), + Avoid function/data pointer conversion in xpath.c (Nick Wellnhofer), + Fix format string warnings (Nick Wellnhofer), + Disallow namespace nodes in XPointer points (Nick Wellnhofer), + Fix comparison with root node in xmlXPathCmpNodes (Nick Wellnhofer), + Fix attribute decoding during XML schema validation (Alex Henrie), + Fix NULL pointer deref in XPointer range-to (Nick Wellnhofer) + + - Improvements: + Updating the spec file to reflect Fedora 24 (Daniel Veillard), + Add const in five places to move 1 KiB to .rdata (Bruce Dawson), + Fix missing part of comment for function xmlXPathEvalExpression() (Daniel Veillard), + Get rid of "blanks wrapper" for parameter entities (Nick Wellnhofer), + Simplify handling of parameter entity references (Nick Wellnhofer), + Deduplicate code in encoding.c (Nick Wellnhofer), + Make HTML parser functions take const pointers (Nick Wellnhofer), + Build test programs only when needed (Nick Wellnhofer), + Fix doc/examples/index.py (Nick Wellnhofer), + Fix compiler warnings in threads.c (Nick Wellnhofer), + Fix empty-body warning in nanohttp.c (Nick Wellnhofer), + Fix cast-align warnings (Nick Wellnhofer), + Fix unused-parameter warnings (Nick Wellnhofer), + Rework entity boundary checks (Nick Wellnhofer), + Don't switch encoding for internal parameter entities (Nick Wellnhofer), + Merge duplicate code paths handling PE references (Nick Wellnhofer), + Test SAX2 callbacks with entity substitution (Nick Wellnhofer), + Support catalog and threads tests under --without-sax1 (Nick Wellnhofer), + Misc fixes for 'make tests' (Nick Wellnhofer), + Initialize keepBlanks in HTML parser (Nick Wellnhofer), + Add test cases for bug 758518 (David Kilzer), + Fix compiler warning in htmlParseElementInternal (Nick Wellnhofer), + Remove useless check in xmlParseAttributeListDecl (Nick Wellnhofer), + Allow zero sized memory input buffers (Nick Wellnhofer), + Add TODO comment in xmlSwitchEncoding (Nick Wellnhofer), + Check for integer overflow in xmlXPathFormatNumber (Nick Wellnhofer), + Make Travis print UBSan stacktraces (Nick Wellnhofer), + Add .travis.yml (Nick Wellnhofer), + Fix expected error output in Python tests (Nick Wellnhofer), + Simplify control flow in xmlParseStartTag2 (Nick Wellnhofer), + Disable LeakSanitizer when running API tests (Nick Wellnhofer), + Avoid out-of-bound array access in API tests (Nick Wellnhofer), + Avoid spurious UBSan errors in parser.c (Nick Wellnhofer), + Parse small XPath numbers more accurately (Nick Wellnhofer), + Rework XPath rounding functions (Nick Wellnhofer), + Fix white space in test output (Nick Wellnhofer), + Fix axis traversal from attribute and namespace nodes (Nick Wellnhofer), + Check for trailing characters in XPath expressions earlier (Nick Wellnhofer), + Rework final handling of XPath results (Nick Wellnhofer), + Make xmlXPathEvalExpression call xmlXPathEval (Nick Wellnhofer), + Remove unused variables (Nick Wellnhofer), + Don't print generic error messages in XPath tests (Nick Wellnhofer) + + - Cleanups: + Fix a couple of misleading indentation errors (Daniel Veillard), + Remove unnecessary calls to xmlPopInput (Nick Wellnhofer) + + + +2.9.4: May 23 2016: + - Security: + More format string warnings with possible format string vulnerability (David Kilzer), + Avoid building recursive entities (Daniel Veillard), + Heap-based buffer overread in htmlCurrentChar (Pranjal Jumde), + Heap-based buffer-underreads due to xmlParseName (David Kilzer), + Heap use-after-free in xmlSAX2AttributeNs (Pranjal Jumde), + Heap use-after-free in htmlParsePubidLiteral and htmlParseSystemiteral (Pranjal Jumde), + Fix some format string warnings with possible format string vulnerability (David Kilzer), + Detect change of encoding when parsing HTML names (Hugh Davenport), + Fix inappropriate fetch of entities content (Daniel Veillard), + Bug 759398: Heap use-after-free in xmlDictComputeFastKey <https://bugzilla.gnome.org/show_bug.cgi?id=759398> (Pranjal Jumde), + Bug 758605: Heap-based buffer overread in xmlDictAddString <https://bugzilla.gnome.org/show_bug.cgi?id=758605> (Pranjal Jumde), + Bug 758588: Heap-based buffer overread in xmlParserPrintFileContextInternal <https://bugzilla.gnome.org/show_bug.cgi?id=758588> (David Kilzer), + Bug 757711: heap-buffer-overflow in xmlFAParsePosCharGroup <https://bugzilla.gnome.org/show_bug.cgi?id=757711> (Pranjal Jumde), + Add missing increments of recursion depth counter to XML parser. (Peter Simons) + + - Documentation: + Fix typo: s{ ec -> cr }cipt (Jan Pokorný), + Fix typos: dictio{ nn -> n }ar{y,ies} (Jan Pokorný), + Fix typos: PATH_{ SEAPARATOR -> SEPARATOR } (Jan Pokorný), + Correct a typo. (Shlomi Fish) + + - Portability: + Correct the usage of LDFLAGS (Mattias Hansson), + Revert the use of SAVE_LDFLAGS in configure.ac (Mattias Hansson), + libxml2 hardcodes -L/lib in zlib/lzma tests which breaks cross-compiles (Mike Frysinger), + Fix apibuild for a recently added construct (Daniel Veillard), + Use pkg-config to locate zlib when possible (Stewart Brodie), + Use pkg-config to locate ICU when possible (Stewart Brodie), + Portability to non C99 compliant compilers (Patrick Monnerat), + dict.h: Move xmlDictPtr definition before includes to allow direct inclusion. (Patrick Monnerat), + os400: tell about xmllint and xmlcatalog in README400. (Patrick Monnerat), + os400: properly process SGML add in XMLCATALOG command. (Patrick Monnerat), + os400: implement CL command XMLCATALOG. (Patrick Monnerat), + os400: compile and install program xmlcatalog (qshell-only). (Patrick Monnerat), + os400: expand tabs in sources, strip trailing blanks. (Patrick Monnerat), + os400: implement CL command XMLLINT. (Patrick Monnerat), + os400: compile and install program xmllint (qshell-only). (Patrick Monnerat), + os400: initscript make_module(): Use options instead of positional parameters. (Patrick Monnerat), + os400: c14n.rpgle: allow *omit for nullable reference parameters. (Patrick Monnerat), + os400: use like() for double type. (Patrick Monnerat), + os400: use like() for int type. (Patrick Monnerat), + os400: use like() for unsigned int type. (Patrick Monnerat), + os400: use like() for enum types. (Patrick Monnerat), + Add xz to xml2-config --libs output (Baruch Siach), + Bug 760190: configure.ac should be able to build --with-icu without icu-config tool <https://bugzilla.gnome.org/show_bug.cgi?id=760190> (David Kilzer), + win32\VC10\config.h and VS 2015 (Bruce Dawson), + Add configure maintainer mode (orzen) + + - Bug Fixes: + Avoid an out of bound access when serializing malformed strings (Daniel Veillard), + Unsigned addition may overflow in xmlMallocAtomicLoc() (David Kilzer), + Integer signed/unsigned type mismatch in xmlParserInputGrow() (David Kilzer), + Bug 763071: heap-buffer-overflow in xmlStrncat <https://bugzilla.gnome.org/show_bug.cgi?id=763071> (Pranjal Jumde), + Integer overflow parsing port number in URI (Michael Paddon), + Fix an error with regexp on nullable counted char transition (Daniel Veillard), + Fix memory leak with XPath namespace nodes (Nick Wellnhofer), + Fix namespace axis traversal (Nick Wellnhofer), + Fix null pointer deref in docs with no root element (Hugh Davenport), + Fix XSD validation of URIs with ampersands (Alex Henrie), + xmlschemastypes.c: accept endOfDayFrag Times set to "24:00:00" mean "end of day" and should not cause an error. (Patrick Monnerat), + xmlcatalog: flush stdout before interactive shell input. (Patrick Monnerat), + xmllint: flush stdout before interactive shell input. (Patrick Monnerat), + Don't recurse into OP_VALUEs in xmlXPathOptimizeExpression (Nick Wellnhofer), + Fix namespace::node() XPath expression (Nick Wellnhofer), + Fix OOB write in xmlXPathEmptyNodeSet (Nick Wellnhofer), + Fix parsing of NCNames in XPath (Nick Wellnhofer), + Fix OOB read with invalid UTF-8 in xmlUTF8Strsize (Nick Wellnhofer), + Do normalize string-based datatype value in RelaxNG facet checking (Audric Schiltknecht), + Bug 760921: REGRESSION (8eb55d78): doc/examples/io1 test fails after fix for "xmlSaveUri() incorrectly recomposes URIs with rootless paths" <https://bugzilla.gnome.org/show_bug.cgi?id=760921> (David Kilzer), + Bug 760861: REGRESSION (bf9c1dad): Missing results for test/schemas/regexp-char-ref_[01].xsd <https://bugzilla.gnome.org/show_bug.cgi?id=760861> (David Kilzer), + error.c: *input->cur == 0 does not mean no error (Pavel Raiskup), + Add missing RNG test files (David Kilzer), + Bug 760183: REGRESSION (v2.9.3): XML push parser fails with bogus UTF-8 encoding error when multi-byte character in large CDATA section is split across buffer <https://bugzilla.gnome.org/show_bug.cgi?id=760183> (David Kilzer), + Bug 758572: ASAN crash in make check <https://bugzilla.gnome.org/show_bug.cgi?id=758572> (David Kilzer), + Bug 721158: Missing ICU string when doing --version on xmllint <https://bugzilla.gnome.org/show_bug.cgi?id=721158> (David Kilzer), + python 3: libxml2.c wrappers create Unicode str already (Michael Stahl), + Add autogen.sh to distrib (orzen), + Heap-based buffer overread in xmlNextChar (Daniel Veillard) + + - Improvements: + Add more debugging info to runtest (Daniel Veillard), + Implement "runtest -u" mode (David Kilzer), + Add a make rule to rebuild for ASAN (Daniel Veillard) + + + +v2.9.3: Nov 20 2015: + - Security: + CVE-2015-8242 Buffer overead with HTML parser in push mode (Hugh Davenport), + CVE-2015-7500 Fix memory access error due to incorrect entities boundaries (Daniel Veillard), + CVE-2015-7499-2 Detect incoherency on GROW (Daniel Veillard), + CVE-2015-7499-1 Add xmlHaltParser() to stop the parser (Daniel Veillard), + CVE-2015-5312 Another entity expansion issue (David Drysdale), + CVE-2015-7497 Avoid an heap buffer overflow in xmlDictComputeFastQKey (David Drysdale), + CVE-2015-7498 Avoid processing entities after encoding conversion failures (Daniel Veillard), + CVE-2015-8035 Fix XZ compression support loop (Daniel Veillard), + CVE-2015-7942-2 Fix an error in previous Conditional section patch (Daniel Veillard), + CVE-2015-7942 Another variation of overflow in Conditional sections (Daniel Veillard), + CVE-2015-1819 Enforce the reader to run in constant memory (Daniel Veillard) + CVE-2015-7941_2 Cleanup conditional section error handling (Daniel Veillard), + CVE-2015-7941_1 Stop parsing on entities boundaries errors (Daniel Veillard), + + - Documentation: + Correct spelling of "calling" (Alex Henrie), + Fix a small error in xmllint --format description (Fabien Degomme), + Avoid XSS on the search of xmlsoft.org (Daniel Veillard) + + - Portability: + threads: use forward declarations only for glibc (Michael Heimpold), + Update Win32 configure.js to search for configure.ac (Daniel Veillard) + + - Bug Fixes: + Bug on creating new stream from entity (Daniel Veillard), + Fix some loop issues embedding NEXT (Daniel Veillard), + Do not print error context when there is none (Daniel Veillard), + Avoid extra processing of MarkupDecl when EOF (Hugh Davenport), + Fix parsing short unclosed comment uninitialized access (Daniel Veillard), + Add missing Null check in xmlParseExternalEntityPrivate (Gaurav Gupta), + Fix a bug in CData error handling in the push parser (Daniel Veillard), + Fix a bug on name parsing at the end of current input buffer (Daniel Veillard), + Fix the spurious ID already defined error (Daniel Veillard), + Fix previous change to node sort order (Nick Wellnhofer), + Fix a self assignment issue raised by clang (Scott Graham), + Fail parsing early on if encoding conversion failed (Daniel Veillard), + Do not process encoding values if the declaration if broken (Daniel Veillard), + Silence clang's -Wunknown-attribute (Michael Catanzaro), + xmlMemUsed is not thread-safe (Martin von Gagern), + Fix support for except in nameclasses (Daniel Veillard), + Fix order of root nodes (Nick Wellnhofer), + Allow attributes on descendant-or-self axis (Nick Wellnhofer), + Fix the fix to Windows locking (Steve Nairn), + Fix timsort invariant loop re: Envisage article (Christopher Swenson), + Don't add IDs in xmlSetTreeDoc (Nick Wellnhofer), + Account for ID attributes in xmlSetTreeDoc (Nick Wellnhofer), + Remove various unused value assignments (Philip Withnall), + Fix missing entities after CVE-2014-3660 fix (Daniel Veillard), + Revert "Missing initialization for the catalog module" (Daniel Veillard) + + - Improvements: + Reuse xmlHaltParser() where it makes sense (Daniel Veillard), + xmlStopParser reset errNo (Daniel Veillard), + Reenable xz support by default (Daniel Veillard), + Recover unescaped less-than character in HTML recovery parsing (Daniel Veillard), + Allow HTML serializer to output HTML5 DOCTYPE (Shaun McCance), + Regression test for bug #695699 (Nick Wellnhofer), + Add a couple of XPath tests (Nick Wellnhofer), + Add Python 3 rpm subpackage (Tomas Radej), + libxml2-config.cmake.in: update include directories (Samuel Martin), + Adding example from bugs 738805 to regression tests (Daniel Veillard) + + - Cleanups: + + + 2.9.2: Oct 16 2014: - Security: Fix for CVE-2014-3660 billion laugh variant (Daniel Veillard), @@ -845,7 +1288,7 @@ Gansterer), - Improvement: switch parser to XML-1.0 5th edition, add parsing flags for old versions, switch URI parsing to RFC 3986, add xmlSchemaValidCtxtGetParserCtxt (Holger Kaelberer), - new hashing functions for dictionaries (based on Stefan Behnel work), + new hashing functions for dictionnaries (based on Stefan Behnel work), improve handling of misplaced html/head/body in HTML parser, better regression test tools and code coverage display, better algorithms to detect various versions of the billion laughts attacks, make @@ -955,7 +1398,7 @@ Gansterer), on Windows (Igor Zlatkovic), htmlCtxtReset fix (Michael Day), XPath principal node of axis bug, HTML serialization of some codepoint (Steven Rainwater), user data propagation in XInclude (Michael Day), - standalone and XML decl detection (Michael Day), Python id ouptut + standalone and XML decl detection (Michael Day), Python id output for some id, fix the big python string memory leak, URI parsing fixes (StÃ©phane Bidoul and William), long comments parsing bug (William), concurrent threads initialization (Ted Phelps), invalid char @@ -967,7 +1410,7 @@ Gansterer), min occurs of 0 (William), HTML script/style parsing (Mike Day) - Improvement: make xmlTextReaderSetup() public - Compilation and postability: fix a missing include problem (William), - __ss_familly on AIX again (BjÃ¶rn Wiberg), compilation without zlib + __ss_family on AIX again (BjÃ¶rn Wiberg), compilation without zlib (Michael Day), catalog patch for Win32 (Christian Ehrlicher), Windows CE fixes (Andreas Stricke) - Various CVS to SVN infrastructure changes @@ -1006,7 +1449,7 @@ Gansterer), fix attribute serialization in writer (Rob Richards), PHP4 DTD validation crasher, parser safety patch (Ben Darnell), _private context propagation when parsing entities (with Michael Day), fix entities behaviour when - using SAX, URI to file path fix (Mikhail Zabaluev), disapearing validity + using SAX, URI to file path fix (Mikhail Zabaluev), disappearing validity context, arg error in SAX callback (Mike Hommey), fix mixed-content autodetect when using --noblanks, fix xmlIOParseDTD error handling, fix bug in xmlSplitQName on special Names, fix Relax-NG element content @@ -1090,7 +1533,7 @@ Do not use or package 2.6.25 split problem (William), issues with non-namespaced attributes in xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards), HTML parsing of script, Python must not output to stdout (Nic Ferrier), - exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype + exclusive C14N namespace visibility (Aleksey Sanin), XSD datatype totalDigits bug (Kasimier Buchcik), error handling when writing to an xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix @@ -1099,7 +1542,7 @@ Do not use or package 2.6.25 (Gary Coady), regexp bug affecting schemas (Kasimier), configuration of runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs (Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair), - compilation and build fixes (Michael Day), removed dependancies on + compilation and build fixes (Michael Day), removed dependencies on xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath pattern based evaluation fixes (Kasimier) - improvements: XSD Schemas redefinitions/restrictions (Kasimier @@ -1144,7 +1587,7 @@ Do not use or package 2.6.25 foreign namespaces handling, XML Schemas facet comparison (Kupriyanov Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier Buchcik), xml: namespace ahndling in Schemas (Kasimier), empty model group in Schemas - (Kasimier), wilcard in Schemas (Kasimier), URI composition (William), + (Kasimier), wildcard in Schemas (Kasimier), URI composition (William), xs:anyType in Schemas (Kasimier), Python resolver emmitting error messages directly, Python xmlAttr.parent (Jakub Piotr Clapa), trying to fix the file path/URI conversion, xmlTextReaderGetAttribute fix (Rob @@ -1231,7 +1674,7 @@ Do not use or package 2.6.25 Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed), some gcc4 fixes, HP-UX portability fixes (Rick Jones). - bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and - xmlreader stopping on non-fatal errors, thread support for dictionaries + xmlreader stopping on non-fatal errors, thread support for dictionnaries reference counting (Gary Coady), internal subset and push problem, URL saved in xmlCopyDoc, various schemas bug fixes (Kasimier), Python paths fixup (Stephane Bidoul), xmlGetNodePath and namespaces, xmlSetNsProp fix @@ -1318,7 +1761,7 @@ Do not use or package 2.6.25 Buchcik), XInclude testing, Notation serialization, UTF8ToISO8859x transcoding (Mark Itzcovitz), lots of XML Schemas cleanup and fixes (Kasimier), ChangeLog cleanup (Stepan Kasal), memory fixes (Mark Vakoc), - handling of failed realloc(), out of bound array adressing in Schemas + handling of failed realloc(), out of bound array addressing in Schemas date handling, Python space/tabs cleanups (Malcolm Tredinnick), NMTOKENS E20 validation fix (Malcolm), - improvements: added W3C XML Schemas testsuite (Kasimier Buchcik), add @@ -1335,7 +1778,7 @@ Do not use or package 2.6.25 (Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack and Julius Mittenzwei), Schemas facet check (Kasimier), default namespace problem (William), Schemas hexbinary empty values, encoding error could - genrate a serialization loop. + generate a serialization loop. - Improvements: Schemas validity improvements (Kasimier), added --path and --load-trace options to xmllint - documentation: tutorial update (John Fleck) @@ -1482,7 +1925,7 @@ Do not use or package 2.6.25 William) reported by Yuuichi Teranishi - bugfixes: make test and path issues, xmlWriter attribute serialization (William Brack), xmlWriter indentation (William), schemas validation - (Eric Haszlakiewicz), XInclude dictionaries issues (William and Oleg + (Eric Haszlakiewicz), XInclude dictionnaries issues (William and Oleg Paraschenko), XInclude empty fallback (William), HTML warnings (William), XPointer in XInclude (William), Python namespace serialization, isolat1ToUTF8 bound error (Alfred Mickautsch), output of parameter @@ -1493,7 +1936,7 @@ Do not use or package 2.6.25 --with-minimum configuration. - XInclude: allow the 2001 namespace without warning. - Documentation: missing example/index.html (John Fleck), version - dependancies (John Fleck) + dependencies (John Fleck) - reader API: structured error reporting (Steve Ball) - Windows compilation: mingw, msys (Mikhail Grushinskiy), function prototype (Cameron Johnson), MSVC6 compiler warnings, _WINSOCKAPI_ @@ -1503,7 +1946,7 @@ Do not use or package 2.6.25 2.6.5: Jan 25 2004: - - Bugfixes: dictionaries for schemas (William Brack), regexp segfault + - Bugfixes: dictionnaries for schemas (William Brack), regexp segfault (William), xs:all problem (William), a number of XPointer bugfixes (William), xmllint error go to stderr, DTD validation problem with namespace, memory leak (William), SAX1 cleanup and minimal options fixes @@ -1627,7 +2070,7 @@ Do not use or package 2.6.25 intercepted at a structured level, with precise information available. - New simpler and more generic XML and HTML parser APIs, allowing to - easilly modify the parsing options and reuse parser context for multiple + easily modify the parsing options and reuse parser context for multiple consecutive documents. - Similar new APIs for the xmlReader, for options and reuse, provided new functions to access content as const strings, use them for Python diff --git a/sdk/lib/3rdparty/libxml2/README b/sdk/lib/3rdparty/libxml2/README index 749e671fe5e..5c7bddf8de2 100644 --- a/sdk/lib/3rdparty/libxml2/README +++ b/sdk/lib/3rdparty/libxml2/README @@ -8,6 +8,7 @@ This code is released under the MIT Licence see the Copyright file. To build on an Unixised setup: ./configure ; make ; make install + if the ./configure file does not exist, run ./autogen.sh instead. To build on Windows: see instructions on win32/Readme.txt diff --git a/sdk/lib/3rdparty/libxml2/SAX2.c b/sdk/lib/3rdparty/libxml2/SAX2.c index 7642501a186..5f141f9a3cc 100644 --- a/sdk/lib/3rdparty/libxml2/SAX2.c +++ b/sdk/lib/3rdparty/libxml2/SAX2.c @@ -40,7 +40,7 @@ * TODO: * * macro to flag unimplemented blocks - * XML_CATALOG_PREFER user env to select between system/public prefered + * XML_CATALOG_PREFER user env to select between system/public preferred * option. C.f. Richard Tobin <richard(a)cogsci.ed.ac.uk> *> Just FYI, I am using an environment variable XML_CATALOG_PREFER with *> values "system" and "public". I have made the default be "system" to @@ -1512,8 +1512,8 @@ process_external_subset: attr = elemDecl->attributes; while (attr != NULL) { /* - * Make sure that attributes redefinition occuring in the - * internal subset are not overriden by definitions in the + * Make sure that attributes redefinition occurring in the + * internal subset are not overridden by definitions in the * external subset. */ if (attr->defaultValue != NULL) { @@ -1668,6 +1668,8 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts) if (nodePush(ctxt, ret) < 0) { xmlUnlinkNode(ret); xmlFreeNode(ret); + if (prefix != NULL) + xmlFree(prefix); return; } @@ -1734,8 +1736,8 @@ xmlSAX2StartElement(void *ctx, const xmlChar *fullname, const xmlChar **atts) } /* - * set the namespace node, making sure that if the default namspace - * is unbound on a parent we simply kee it NULL + * set the namespace node, making sure that if the default namespace + * is unbound on a parent we simply keep it NULL */ if ((ns != NULL) && (ns->href != NULL) && ((ns->href[0] != 0) || (ns->prefix != NULL))) @@ -2010,7 +2012,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt, else ret->name = xmlStrdup(localname); - /* link at the end to preserv order, TODO speed up with a last */ + /* link at the end to preserve order, TODO speed up with a last */ if (ctxt->node->properties == NULL) { ctxt->node->properties = ret; } else { @@ -2102,7 +2104,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt, } else { /* * dup now contains a string of the flattened attribute - * content with entities substitued. Check if we need to + * content with entities substituted. Check if we need to * apply an extra layer of normalization. * It need to be done twice ... it's an extra burden related * to the ability to keep references in attributes @@ -2135,7 +2137,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt, } } else { /* - * if entities already have been substitued, then + * if entities already have been substituted, then * the attribute as passed is already normalized */ dup = xmlStrndup(value, valueend - value); @@ -2398,7 +2400,7 @@ xmlSAX2StartElementNs(void *ctx, if (nb_attributes > 0) { for (j = 0,i = 0;i < nb_attributes;i++,j+=5) { /* - * Handle the rare case of an undefined atribute prefix + * Handle the rare case of an undefined attribute prefix */ if ((attributes[j+1] != NULL) && (attributes[j+2] == NULL)) { if (ctxt->dictNames) { @@ -2584,7 +2586,7 @@ xmlSAX2Characters(void *ctx, const xmlChar *ch, int len) * The whole point of maintaining nodelen and nodemem, * xmlTextConcat is too costly, i.e. compute length, * reallocate a new buffer, move data, append ch. Here - * We try to minimaze realloc() uses and avoid copying + * We try to minimize realloc() uses and avoid copying * and recomputing length over and over. */ if (lastChild->content == (xmlChar *)&(lastChild->properties)) { diff --git a/sdk/lib/3rdparty/libxml2/buf.c b/sdk/lib/3rdparty/libxml2/buf.c index 21cb9d80477..d46da365142 100644 --- a/sdk/lib/3rdparty/libxml2/buf.c +++ b/sdk/lib/3rdparty/libxml2/buf.c @@ -1,7 +1,7 @@ /* * buf.c: memory buffers for libxml2 * - * new buffer structures and entry points to simplify the maintainance + * new buffer structures and entry points to simplify the maintenance * of libxml2 and ensure we keep good control over memory allocations * and stay 64 bits clean. * The new entry point use the xmlBufPtr opaque structure and @@ -396,7 +396,7 @@ xmlBufShrink(xmlBufPtr buf, size_t len) { ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL))) { /* * we just move the content pointer, but also make sure - * the perceived buffer size has shrinked accordingly + * the perceived buffer size has shrunk accordingly */ buf->content += len; buf->size -= len; @@ -958,7 +958,7 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) { if (start_buf > (unsigned int) len) { /* - * We can add it in the space previously shrinked + * We can add it in the space previously shrunk */ buf->content -= len; memmove(&buf->content[0], str, len); @@ -1204,10 +1204,10 @@ xmlBufferPtr xmlBufBackToBuffer(xmlBufPtr buf) { xmlBufferPtr ret; - if ((buf == NULL) || (buf->error)) + if (buf == NULL) return(NULL); CHECK_COMPAT(buf) - if (buf->buffer == NULL) { + if ((buf->error) || (buf->buffer == NULL)) { xmlBufFree(buf); return(NULL); } @@ -1307,7 +1307,7 @@ xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input) { CHECK_COMPAT(buf) base = input->base - buf->content; /* - * We could do some pointer arythmetic checks but that's probably + * We could do some pointer arithmetic checks but that's probably * sufficient. */ if (base > buf->size) { diff --git a/sdk/lib/3rdparty/libxml2/c14n.c b/sdk/lib/3rdparty/libxml2/c14n.c index d80ae8b7a82..5b3fbe70c6c 100644 --- a/sdk/lib/3rdparty/libxml2/c14n.c +++ b/sdk/lib/3rdparty/libxml2/c14n.c @@ -43,7 +43,7 @@ typedef enum { typedef struct _xmlC14NVisibleNsStack { int nsCurEnd; /* number of nodes in the set */ - int nsPrevStart; /* the begginning of the stack for previous visible node */ + int nsPrevStart; /* the beginning of the stack for previous visible node */ int nsPrevEnd; /* the end of the stack for previous visible node */ int nsMax; /* size of the array as allocated */ xmlNsPtr *nsTab; /* array of ns in no particular order */ @@ -226,7 +226,7 @@ xmlC14NErrRelativeNamespace(const char *ns_uri) * xmlC14NErr: * @ctxt: a C14N evaluation context * @node: the context node - * @error: the erorr code + * @error: the error code * @msg: the message * @extra: extra informations * @@ -1827,7 +1827,7 @@ xmlC14NNewCtx(xmlDocPtr doc, } /* - * Set "mode" flag and remember list of incluseve prefixes + * Set "mode" flag and remember list of inclusive prefixes * for exclusive c14n */ ctx->mode = mode; @@ -2039,7 +2039,7 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes, (void) xmlOutputBufferClose(buf); if ((*doc_txt_ptr == NULL) && (ret > 0)) { - xmlC14NErrMemory("coping canonicanized document"); + xmlC14NErrMemory("coping canonicalized document"); return (-1); } return (ret); @@ -2057,7 +2057,7 @@ xmlC14NDocDumpMemory(xmlDocPtr doc, xmlNodeSetPtr nodes, * canonicalization, ignored otherwise) * @with_comments: include comments in the result (!=0) or not (==0) * @filename: the filename to store canonical XML image - * @compression: the compression level (zlib requred): + * @compression: the compression level (zlib required): * -1 - libxml default, * 0 - uncompressed, * >0 - compression level @@ -2100,7 +2100,7 @@ xmlC14NDocSave(xmlDocPtr doc, xmlNodeSetPtr nodes, ret = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes, with_comments, buf); if (ret < 0) { - xmlC14NErrInternal("cannicanize document to buffer"); + xmlC14NErrInternal("canonize document to buffer"); (void) xmlOutputBufferClose(buf); return (-1); } diff --git a/sdk/lib/3rdparty/libxml2/catalog.c b/sdk/lib/3rdparty/libxml2/catalog.c index f814121ce82..7328fd319c0 100644 --- a/sdk/lib/3rdparty/libxml2/catalog.c +++ b/sdk/lib/3rdparty/libxml2/catalog.c @@ -56,7 +56,7 @@ * TODO: * * macro to flag unimplemented blocks - * XML_CATALOG_PREFER user env to select between system/public prefered + * XML_CATALOG_PREFER user env to select between system/public preferred * option. C.f. Richard Tobin <richard(a)cogsci.ed.ac.uk> *> Just FYI, I am using an environment variable XML_CATALOG_PREFER with *> values "system" and "public". I have made the default be "system" to diff --git a/sdk/lib/3rdparty/libxml2/debugXML.c b/sdk/lib/3rdparty/libxml2/debugXML.c index c98db0bcc77..d855555861d 100644 --- a/sdk/lib/3rdparty/libxml2/debugXML.c +++ b/sdk/lib/3rdparty/libxml2/debugXML.c @@ -289,7 +289,7 @@ xmlCtxtGenericNodeCheck(xmlDebugCtxtPtr ctxt, xmlNodePtr node) { dict = doc->dict; if ((dict == NULL) && (ctxt->nodict == 0)) { #if 0 - /* desactivated right now as it raises too many errors */ + /* deactivated right now as it raises too many errors */ if (doc->type == XML_DOCUMENT_NODE) xmlDebugErr(ctxt, XML_CHECK_NO_DICT, "Document has no dictionary\n"); @@ -1168,7 +1168,7 @@ xmlCtxtDumpDocHead(xmlDebugCtxtPtr ctxt, xmlDocPtr doc) * @output: the FILE * for the output * @doc: the document * - * Dumps debug information cncerning the document, not recursive + * Dumps debug information concerning the document, not recursive */ static void xmlCtxtDumpDocumentHead(xmlDebugCtxtPtr ctxt, xmlDocPtr doc) @@ -1498,7 +1498,7 @@ xmlDebugDumpNodeList(FILE * output, xmlNodePtr node, int depth) * @output: the FILE * for the output * @doc: the document * - * Dumps debug information cncerning the document, not recursive + * Dumps debug information concerning the document, not recursive */ void xmlDebugDumpDocumentHead(FILE * output, xmlDocPtr doc) @@ -2363,10 +2363,7 @@ xmlShellRNGValidate(xmlShellCtxtPtr sctxt, char *schemas, int ret; ctxt = xmlRelaxNGNewParserCtxt(schemas); - xmlRelaxNGSetParserErrors(ctxt, - (xmlRelaxNGValidityErrorFunc) fprintf, - (xmlRelaxNGValidityWarningFunc) fprintf, - stderr); + xmlRelaxNGSetParserErrors(ctxt, xmlGenericError, xmlGenericError, NULL); relaxngschemas = xmlRelaxNGParse(ctxt); xmlRelaxNGFreeParserCtxt(ctxt); if (relaxngschemas == NULL) { @@ -2375,10 +2372,7 @@ xmlShellRNGValidate(xmlShellCtxtPtr sctxt, char *schemas, return(-1); } vctxt = xmlRelaxNGNewValidCtxt(relaxngschemas); - xmlRelaxNGSetValidErrors(vctxt, - (xmlRelaxNGValidityErrorFunc) fprintf, - (xmlRelaxNGValidityWarningFunc) fprintf, - stderr); + xmlRelaxNGSetValidErrors(vctxt, xmlGenericError, xmlGenericError, NULL); ret = xmlRelaxNGValidateDoc(vctxt, sctxt->doc); if (ret == 0) { fprintf(stderr, "%s validates\n", sctxt->filename); @@ -2647,9 +2641,9 @@ xmlShellValidate(xmlShellCtxtPtr ctxt, char *dtd, int res = -1; if ((ctxt == NULL) || (ctxt->doc == NULL)) return(-1); - vctxt.userData = stderr; - vctxt.error = (xmlValidityErrorFunc) fprintf; - vctxt.warning = (xmlValidityWarningFunc) fprintf; + vctxt.userData = NULL; + vctxt.error = xmlGenericError; + vctxt.warning = xmlGenericError; if ((dtd == NULL) || (dtd[0] == 0)) { res = xmlValidateDocument(&vctxt, ctxt->doc); diff --git a/sdk/lib/3rdparty/libxml2/dict.c b/sdk/lib/3rdparty/libxml2/dict.c index 0ef3718da28..336e046aecf 100644 --- a/sdk/lib/3rdparty/libxml2/dict.c +++ b/sdk/lib/3rdparty/libxml2/dict.c @@ -38,7 +38,8 @@ * list we will use the BigKey algo as soon as the hash size grows * over MIN_DICT_SIZE so this actually works */ -#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) && \ + !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) #define DICT_RANDOMIZATION #endif @@ -371,6 +372,9 @@ found_pool: * http://burtleburtle.net/bob/hash/doobs.html */ +#ifdef __clang__ +ATTRIBUTE_NO_SANITIZE("unsigned-integer-overflow") +#endif static uint32_t xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) { uint32_t hash; @@ -403,6 +407,9 @@ xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) { * * Neither of the two strings must be NULL. */ +#ifdef __clang__ +ATTRIBUTE_NO_SANITIZE("unsigned-integer-overflow") +#endif static unsigned long xmlDictComputeBigQKey(const xmlChar *prefix, int plen, const xmlChar *name, int len, int seed) @@ -727,7 +734,7 @@ xmlDictGrow(xmlDictPtr dict, size_t size) { dict->dict[key].next = entry; } else { /* - * we don't have much ways to alert from herei + * we don't have much ways to alert from here * result is losing an entry and unicity guarantee */ ret = -1; @@ -1202,7 +1209,7 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) { * @dict: the dictionary * @str: the string * - * check if a string is owned by the disctionary + * check if a string is owned by the dictionary * * Returns 1 if true, 0 if false and -1 in case of error * -1 in case of error diff --git a/sdk/lib/3rdparty/libxml2/elfgcchack.h b/sdk/lib/3rdparty/libxml2/elfgcchack.h index 5ac93bfb9f4..af8ad1148d2 100644 --- a/sdk/lib/3rdparty/libxml2/elfgcchack.h +++ b/sdk/lib/3rdparty/libxml2/elfgcchack.h @@ -4311,6 +4311,16 @@ extern __typeof (xmlHashCreateDict) xmlHashCreateDict__internal_alias __attribut #endif #endif +#ifdef bottom_hash +#undef xmlHashDefaultDeallocator +extern __typeof (xmlHashDefaultDeallocator) xmlHashDefaultDeallocator __attribute((alias("xmlHashDefaultDeallocator__internal_alias"))); +#else +#ifndef xmlHashDefaultDeallocator +extern __typeof (xmlHashDefaultDeallocator) xmlHashDefaultDeallocator__internal_alias __attribute((visibility("hidden"))); +#define xmlHashDefaultDeallocator xmlHashDefaultDeallocator__internal_alias +#endif +#endif + #ifdef bottom_hash #undef xmlHashFree extern __typeof (xmlHashFree) xmlHashFree __attribute((alias("xmlHashFree__internal_alias"))); diff --git a/sdk/lib/3rdparty/libxml2/enc.h b/sdk/lib/3rdparty/libxml2/enc.h index 057d206df8a..a69a5d03c85 100644 --- a/sdk/lib/3rdparty/libxml2/enc.h +++ b/sdk/lib/3rdparty/libxml2/enc.h @@ -1,7 +1,7 @@ /* * Summary: Internal Interfaces for encoding in libxml2 * Description: this module describes a few interfaces which were - * addded along with the API changes in 2.9.0 + * added along with the API changes in 2.9.0 * those are private routines at this point * * Copy: See Copyright for the status of this software. diff --git a/sdk/lib/3rdparty/libxml2/encoding.c b/sdk/lib/3rdparty/libxml2/encoding.c index a3aaf10ec1b..ad4d8a63a31 100644 --- a/sdk/lib/3rdparty/libxml2/encoding.c +++ b/sdk/lib/3rdparty/libxml2/encoding.c @@ -1795,7 +1795,7 @@ xmlFindCharEncodingHandler(const char *name) { * * The value of @inlen after return is the number of octets consumed * as the return value is positive, else unpredictable. - * The value of @outlen after return is the number of ocetes consumed. + * The value of @outlen after return is the number of octets consumed. */ static int xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, @@ -1863,7 +1863,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, * * The value of @inlen after return is the number of octets consumed * as the return value is positive, else unpredictable. - * The value of @outlen after return is the number of ocetes consumed. + * The value of @outlen after return is the number of octets consumed. */ static int xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, @@ -1972,7 +1972,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, /** * xmlCharEncFirstLineInt: - * @handler: char enconding transformation data structure + * @handler: char encoding transformation data structure * @out: an xmlBuffer for the output. * @in: an xmlBuffer for the input * @len: number of bytes to convert for the first line, or -1 @@ -2059,7 +2059,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out, /** * xmlCharEncFirstLine: - * @handler: char enconding transformation data structure + * @handler: char encoding transformation data structure * @out: an xmlBuffer for the output. * @in: an xmlBuffer for the input * @@ -2546,7 +2546,7 @@ retry: /** * xmlCharEncOutFunc: - * @handler: char enconding transformation data structure + * @handler: char encoding transformation data structure * @out: an xmlBuffer for the output. * @in: an xmlBuffer for the input * @@ -2710,7 +2710,7 @@ retry: /** * xmlCharEncCloseFunc: - * @handler: char enconding transformation data structure + * @handler: char encoding transformation data structure * * Generic front-end for encoding handler close function * @@ -2811,7 +2811,7 @@ xmlByteConsumed(xmlParserCtxtPtr ctxt) { xmlCharEncodingHandler * handler = in->buf->encoder; /* * Encoding conversion, compute the number of unused original - * bytes from the input not consumed and substract that from + * bytes from the input not consumed and subtract that from * the raw consumed value, this is not a cheap operation */ if (in->end - in->cur > 0) { @@ -2860,7 +2860,7 @@ xmlByteConsumed(xmlParserCtxtPtr ctxt) { * Returns 0 if success, -2 if the transcoding fails, or -1 otherwise * The value of @inlen after return is the number of octets consumed * as the return value is positive, else unpredictable. - * The value of @outlen after return is the number of ocetes consumed. + * The value of @outlen after return is the number of octets consumed. */ static int UTF8ToISO8859x(unsigned char* out, int *outlen, @@ -2976,7 +2976,7 @@ UTF8ToISO8859x(unsigned char* out, int *outlen, * block of chars out. * Returns 0 if success, or -1 otherwise * The value of @inlen after return is the number of octets consumed - * The value of @outlen after return is the number of ocetes produced. + * The value of @outlen after return is the number of octets produced. */ static int ISO8859xToUTF8(unsigned char* out, int *outlen, diff --git a/sdk/lib/3rdparty/libxml2/entities.c b/sdk/lib/3rdparty/libxml2/entities.c index 43549bc5def..d575e9d177b 100644 --- a/sdk/lib/3rdparty/libxml2/entities.c +++ b/sdk/lib/3rdparty/libxml2/entities.c @@ -148,7 +148,7 @@ xmlFreeEntity(xmlEntityPtr entity) /* * xmlCreateEntity: * - * internal routine doing the entity node strutures allocations + * internal routine doing the entity node structures allocations */ static xmlEntityPtr xmlCreateEntity(xmlDictPtr dict, const xmlChar *name, int type, @@ -398,7 +398,7 @@ xmlAddDocEntity(xmlDocPtr doc, const xmlChar *name, int type, * * Create a new entity, this differs from xmlAddDocEntity() that if * the document is NULL or has no internal subset defined, then an - * unlinked entity structure will be returned, it is then the responsability + * unlinked entity structure will be returned, it is then the responsibility * of the caller to link it to the document later or free it when not needed * anymore. * @@ -548,7 +548,7 @@ xmlGetDocEntity(const xmlDoc *doc, const xmlChar *name) { * xmlEncodeEntitiesInternal: * @doc: the document containing the string * @input: A string to convert to XML. - * @attr: are we handling an atrbute value + * @attr: are we handling an attribute value * * Do a global encoding of a string, replacing the predefined entities * and non ASCII values with their entities and CharRef counterparts. diff --git a/sdk/lib/3rdparty/libxml2/error.c b/sdk/lib/3rdparty/libxml2/error.c index 50e9e6f8603..b7d5b36bc79 100644 --- a/sdk/lib/3rdparty/libxml2/error.c +++ b/sdk/lib/3rdparty/libxml2/error.c @@ -238,7 +238,7 @@ xmlParserPrintFileContext(xmlParserInputPtr input) { * @ctx: the parser context or NULL * @str: the formatted error message * - * Report an erro with its context, replace the 4 old error/warning + * Report an error with its context, replace the 4 old error/warning * routines. */ static void @@ -631,7 +631,7 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel, (channel == xmlParserValidityError) || (channel == xmlParserValidityWarning)) xmlReportError(to, ctxt, str, NULL, NULL); - else if ((channel == (xmlGenericErrorFunc) fprintf) || + else if (((void(*)(void)) channel == (void(*)(void)) fprintf) || (channel == xmlGenericErrorDefaultFunc)) xmlReportError(to, ctxt, str, channel, data); else diff --git a/sdk/lib/3rdparty/libxml2/globals.c b/sdk/lib/3rdparty/libxml2/globals.c index 20b430880ab..7bf985f487a 100644 --- a/sdk/lib/3rdparty/libxml2/globals.c +++ b/sdk/lib/3rdparty/libxml2/globals.c @@ -107,7 +107,7 @@ xmlMallocFunc xmlMalloc = malloc; * @size: the size requested in bytes * * The variable holding the libxml malloc() implementation for atomic - * data (i.e. blocks not containings pointers), useful when using a + * data (i.e. blocks not containing pointers), useful when using a * garbage collecting allocator. * * Returns a pointer to the newly allocated block or NULL in case of error @@ -260,7 +260,7 @@ static int xmlPedanticParserDefaultValueThrDef = 0; * Global setting, indicate that the parser should store the line number * in the content field of elements in the DOM tree. * Disabled by default since this may not be safe for old classes of - * applicaton. + * application. */ int xmlLineNumbersDefaultValue = 0; static int xmlLineNumbersDefaultValueThrDef = 0; @@ -361,7 +361,7 @@ static const char *xmlTreeIndentStringThrDef = " "; * xmlSaveNoEmptyTags: * * Global setting, asking the serializer to not output empty tags - * as <empty/> but <empty></empty>. those two forms are undistinguishable + * as <empty/> but <empty></empty>. those two forms are indistinguishable * once parsed. * Disabled by default */ diff --git a/sdk/lib/3rdparty/libxml2/hash.c b/sdk/lib/3rdparty/libxml2/hash.c index b0b4abc92e4..a83d979b64a 100644 --- a/sdk/lib/3rdparty/libxml2/hash.c +++ b/sdk/lib/3rdparty/libxml2/hash.c @@ -33,7 +33,8 @@ * it seems that having hash randomization might be a good idea * when using XML with untrusted data */ -#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) && \ + !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) #define HASH_RANDOMIZATION #endif @@ -78,6 +79,9 @@ struct _xmlHashTable { * xmlHashComputeKey: * Calculate the hash key */ +#ifdef __clang__ +ATTRIBUTE_NO_SANITIZE("unsigned-integer-overflow") +#endif static unsigned long xmlHashComputeKey(xmlHashTablePtr table, const xmlChar *name, const xmlChar *name2, const xmlChar *name3) { @@ -108,6 +112,9 @@ xmlHashComputeKey(xmlHashTablePtr table, const xmlChar *name, return (value % table->size); } +#ifdef __clang__ +ATTRIBUTE_NO_SANITIZE("unsigned-integer-overflow") +#endif static unsigned long xmlHashComputeQKey(xmlHashTablePtr table, const xmlChar *prefix, const xmlChar *name, diff --git a/sdk/lib/3rdparty/libxml2/include/win32config.h b/sdk/lib/3rdparty/libxml2/include/win32config.h index 7fc74031400..54392f4961e 100644 --- a/sdk/lib/3rdparty/libxml2/include/win32config.h +++ b/sdk/lib/3rdparty/libxml2/include/win32config.h @@ -38,7 +38,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) /* MS C-runtime has functions which can be used in order to determine if a given floating-point variable contains NaN, (+-)INF. These are - preferred, because floating-point technology is considered propriatary + preferred, because floating-point technology is considered proprietary by MS and we can assume that their functions know more about their oddities than we do. */ #include <float.h> diff --git a/sdk/lib/3rdparty/libxml2/include/wsockcompat.h b/sdk/lib/3rdparty/libxml2/include/wsockcompat.h index 0484ee36c66..e57ca8ec56e 100644 --- a/sdk/lib/3rdparty/libxml2/include/wsockcompat.h +++ b/sdk/lib/3rdparty/libxml2/include/wsockcompat.h @@ -11,6 +11,11 @@ #include <errno.h> #include <winsock2.h> +/* Fix for old MinGW. */ +#ifndef _WINSOCKAPI_ +#define _WINSOCKAPI_ +#endif + /* the following is a workaround a problem for 'inline' keyword in said header when compiled with Borland C++ 6 */ #if defined(__BORLANDC__) && !defined(__cplusplus) diff --git a/sdk/lib/3rdparty/libxml2/libxml.h b/sdk/lib/3rdparty/libxml2/libxml.h index 64e30f77046..1090729c65e 100644 --- a/sdk/lib/3rdparty/libxml2/libxml.h +++ b/sdk/lib/3rdparty/libxml2/libxml.h @@ -34,7 +34,7 @@ /* * Currently supported platforms use either autoconf or * copy to config.h own "preset" configuration file. - * As result ifdef HAVE_CONFIG_H is omited here. + * As result ifdef HAVE_CONFIG_H is omitted here. */ #include "config.h" #include <libxml/xmlversion.h> @@ -53,7 +53,7 @@ int vfprintf(FILE *, const char *, va_list); /** * TRIO_REPLACE_STDIO: * - * This macro is defined if teh trio string formatting functions are to + * This macro is defined if the trio string formatting functions are to * be used instead of the default stdio ones. */ #define TRIO_REPLACE_STDIO @@ -72,6 +72,13 @@ int vfprintf(FILE *, const char *, va_list); #define XML_POP_WARNINGS #endif +#if defined(__clang__) || \ + (defined(__GNUC__) && (__GNUC__ >= 8)) +#define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg))) +#else +#define ATTRIBUTE_NO_SANITIZE(arg) +#endif + /* * Internal variable indicating if a callback has been registered for * node creation/destruction. It avoids spending a lot of time in locking @@ -79,7 +86,7 @@ int vfprintf(FILE *, const char *, va_list); */ extern int __xmlRegisterCallbacks; /* - * internal error reporting routines, shared but not partof the API. + * internal error reporting routines, shared but not part of the API. */ void __xmlIOErr(int domain, int code, const char *extra); void __xmlLoaderErr(void *ctx, const char *msg, const char *filename) LIBXML_ATTR_FORMAT(2,0); diff --git a/sdk/lib/3rdparty/libxml2/nanohttp.c b/sdk/lib/3rdparty/libxml2/nanohttp.c index 2143718a142..018b7e189b7 100644 --- a/sdk/lib/3rdparty/libxml2/nanohttp.c +++ b/sdk/lib/3rdparty/libxml2/nanohttp.c @@ -1143,12 +1143,12 @@ xmlNanoHTTPConnectHost(const char *host, int port) switch (h_errno) { case HOST_NOT_FOUND: - h_err_txt = "Authoritive host not found"; + h_err_txt = "Authoritative host not found"; break; case TRY_AGAIN: h_err_txt = - "Non-authoritive host not found or server failure."; + "Non-authoritative host not found or server failure."; break; case NO_RECOVERY: diff --git a/sdk/lib/3rdparty/libxml2/parser.c b/sdk/lib/3rdparty/libxml2/parser.c index 5813a6643e1..d1c319631fc 100644 --- a/sdk/lib/3rdparty/libxml2/parser.c +++ b/sdk/lib/3rdparty/libxml2/parser.c @@ -96,6 +96,12 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID, static void xmlHaltParser(xmlParserCtxtPtr ctxt); +static int +xmlParseElementStart(xmlParserCtxtPtr ctxt); + +static void +xmlParseElementEnd(xmlParserCtxtPtr ctxt); + /************************************************************************ * * * Arbitrary limits set in the parser. See XML_PARSE_HUGE * @@ -108,7 +114,7 @@ static void xmlHaltParser(xmlParserCtxtPtr ctxt); /* * XML_PARSER_NON_LINEAR is the threshold where the ratio of parsed entity * replacement over the size in byte of the input indicates that you have - * and eponential behaviour. A value of 10 correspond to at least 3 entity + * and exponential behaviour. A value of 10 correspond to at least 3 entity * replacement per byte of input. */ #define XML_PARSER_NON_LINEAR 10 @@ -140,7 +146,7 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, if ((ent != NULL) && (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) && (ent->content != NULL) && (ent->checked == 0) && (ctxt->errNo != XML_ERR_ENTITY_LOOP)) { - unsigned long oldnbent = ctxt->nbentities; + unsigned long oldnbent = ctxt->nbentities, diff; xmlChar *rep; ent->checked = 1; @@ -153,7 +159,10 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, ent->content[0] = 0; } - ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; + diff = ctxt->nbentities - oldnbent + 1; + if (diff > INT_MAX / 2) + diff = INT_MAX / 2; + ent->checked = diff * 2; if (rep != NULL) { if (xmlStrchr(rep, '<')) ent->checked |= 1; @@ -1060,7 +1069,7 @@ xmlHasFeature(xmlFeature feature) * xmlDetectSAX2: * @ctxt: an XML parser context * - * Do the SAX2 detection and specific intialization + * Do the SAX2 detection and specific initialization */ static void xmlDetectSAX2(xmlParserCtxtPtr ctxt) { @@ -1392,7 +1401,7 @@ xmlCleanSpecialAttr(xmlParserCtxtPtr ctxt) * [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+ * [38] Subcode ::= ([a-z] | [A-Z])+ * - * The current REC reference the sucessors of RFC 1766, currently 5646 + * The current REC reference the successors of RFC 1766, currently 5646 * * http://www.rfc-editor.org/rfc/rfc5646.txt * langtag = language @@ -1819,7 +1828,6 @@ nodePop(xmlParserCtxtPtr ctxt) return (ret); } -#ifdef LIBXML_PUSH_ENABLED /** * nameNsPush: * @ctxt: an XML parser context @@ -1855,6 +1863,11 @@ nameNsPush(xmlParserCtxtPtr ctxt, const xmlChar * value, goto mem_error; } ctxt->pushTab = tmp2; + } else if (ctxt->pushTab == NULL) { + ctxt->pushTab = (void **) xmlMalloc(ctxt->nameMax * 3 * + sizeof(ctxt->pushTab[0])); + if (ctxt->pushTab == NULL) + goto mem_error; } ctxt->nameTab[ctxt->nameNr] = value; ctxt->name = value; @@ -1866,6 +1879,7 @@ mem_error: xmlErrMemory(ctxt, NULL); return (-1); } +#ifdef LIBXML_PUSH_ENABLED /** * nameNsPop: * @ctxt: an XML parser context @@ -2075,11 +2089,11 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) { xmlGROW (ctxt); static void xmlGROW (xmlParserCtxtPtr ctxt) { - unsigned long curEnd = ctxt->input->end - ctxt->input->cur; - unsigned long curBase = ctxt->input->cur - ctxt->input->base; + ptrdiff_t curEnd = ctxt->input->end - ctxt->input->cur; + ptrdiff_t curBase = ctxt->input->cur - ctxt->input->base; - if (((curEnd > (unsigned long) XML_MAX_LOOKUP_LIMIT) || - (curBase > (unsigned long) XML_MAX_LOOKUP_LIMIT)) && + if (((curEnd > XML_MAX_LOOKUP_LIMIT) || + (curBase > XML_MAX_LOOKUP_LIMIT)) && ((ctxt->input->buf) && (ctxt->input->buf->readcallback != xmlInputReadCallbackNop)) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { @@ -2281,9 +2295,8 @@ xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) { */ int xmlParseCharRef(xmlParserCtxtPtr ctxt) { - unsigned int val = 0; + int val = 0; int count = 0; - unsigned int outofrange = 0; /* * Using RAW/CUR/NEXT is okay since we are working on ASCII range here @@ -2310,8 +2323,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) { val = 0; break; } - if (val > 0x10FFFF) - outofrange = val; + if (val > 0x110000) + val = 0x110000; NEXT; count++; @@ -2339,8 +2352,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) { val = 0; break; } - if (val > 0x10FFFF) - outofrange = val; + if (val > 0x110000) + val = 0x110000; NEXT; count++; @@ -2360,7 +2373,11 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) { * Characters referred to using character references must match the * production for Char. */ - if ((IS_CHAR(val) && (outofrange == 0))) { + if (val >= 0x110000) { + xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR, + "xmlParseCharRef: character reference out of bounds\n", + val); + } else if (IS_CHAR(val)) { return(val); } else { xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR, @@ -2392,8 +2409,7 @@ static int xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) { const xmlChar *ptr; xmlChar cur; - unsigned int val = 0; - unsigned int outofrange = 0; + int val = 0; if ((str == NULL) || (*str == NULL)) return(0); ptr = *str; @@ -2413,8 +2429,8 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) { val = 0; break; } - if (val > 0x10FFFF) - outofrange = val; + if (val > 0x110000) + val = 0x110000; ptr++; cur = *ptr; @@ -2432,8 +2448,8 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) { val = 0; break; } - if (val > 0x10FFFF) - outofrange = val; + if (val > 0x110000) + val = 0x110000; ptr++; cur = *ptr; @@ -2451,7 +2467,11 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) { * Characters referred to using character references must match the * production for Char. */ - if ((IS_CHAR(val) && (outofrange == 0))) { + if (val >= 0x110000) { + xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR, + "xmlParseStringCharRef: character reference out of bounds\n", + val); + } else if (IS_CHAR(val)) { return(val); } else { xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR, @@ -2702,7 +2722,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, /* * Note: external parsed entities will not be loaded, * it is not required for a non-validating parser to - * complete external PEreferences coming from the + * complete external PEReferences coming from the * internal subset */ if (((ctxt->options & XML_PARSE_NOENT) != 0) || @@ -3366,7 +3386,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) { /* * when shrinking to extend the buffer we really need to preserve * the part of the name we already parsed. Hence rolling back - * by current lenght. + * by current length. */ ctxt->input->cur -= l; GROW; @@ -3835,7 +3855,7 @@ error: * xmlParseAttValueComplex: * @ctxt: an XML parser context * @len: the resulting attribute len - * @normalize: wether to apply the inner normalization + * @normalize: whether to apply the inner normalization * * parse a value for an attribute, this is the fallback function * of xmlParseAttValue() when the attribute parsing requires handling @@ -3984,14 +4004,17 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { */ if ((ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) && (ent->content != NULL) && (ent->checked == 0)) { - unsigned long oldnbent = ctxt->nbentities; + unsigned long oldnbent = ctxt->nbentities, diff; ++ctxt->depth; rep = xmlStringDecodeEntities(ctxt, ent->content, XML_SUBSTITUTE_REF, 0, 0, 0); --ctxt->depth; - ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; + diff = ctxt->nbentities - oldnbent + 1; + if (diff > INT_MAX / 2) + diff = INT_MAX / 2; + ent->checked = diff * 2; if (rep != NULL) { if (xmlStrchr(rep, '<')) ent->checked |= 1; @@ -4059,7 +4082,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { /* * There we potentially risk an overflow, don't allow attribute value of - * length more than INT_MAX it is a very reasonnable assumption ! + * length more than INT_MAX it is a very reasonable assumption ! */ if (len >= INT_MAX) { xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, @@ -4664,7 +4687,7 @@ xmlParseExternalID(xmlParserCtxtPtr ctxt, xmlChar **publicID, int strict) { * xmlParseCommentComplex: * @ctxt: an XML parser context * @buf: the already parsed part of the buffer - * @len: number of bytes filles in the buffer + * @len: number of bytes in the buffer * @size: allocated size of the buffer * * Skip an XML (SGML) comment  @@ -4955,6 +4978,10 @@ get_more: } else xmlFatalErrMsgStr(ctxt, XML_ERR_HYPHEN_IN_COMMENT, "Double hyphen within comment\n", NULL); + if (ctxt->instate == XML_PARSER_EOF) { + xmlFree(buf); + return; + } in++; ctxt->input->col++; } @@ -5085,7 +5112,7 @@ error: * * [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' * - * The processing is transfered to SAX once parsed. + * The processing is transferred to SAX once parsed. */ void @@ -5501,7 +5528,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { literal, URI, NULL); /* * For expat compatibility in SAX mode. - * assuming the entity repalcement was asked for + * assuming the entity replacement was asked for */ if ((ctxt->replaceEntities != 0) && ((ctxt->myDoc == NULL) || @@ -6611,149 +6638,143 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) { static void xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { - int id = ctxt->input->id; - - SKIP(3); - SKIP_BLANKS; - if (CMP7(CUR_PTR, 'I', 'N', 'C', 'L', 'U', 'D', 'E')) { - SKIP(7); - SKIP_BLANKS; - if (RAW != '[') { - xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); - xmlHaltParser(ctxt); - return; - } else { - if (ctxt->input->id != id) { - xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, - "All markup of the conditional section is not" - " in the same entity\n"); - } - NEXT; - } - if (xmlParserDebugEntities) { - if ((ctxt->input != NULL) && (ctxt->input->filename)) - xmlGenericError(xmlGenericErrorContext, - "%s(%d): ", ctxt->input->filename, - ctxt->input->line); - xmlGenericError(xmlGenericErrorContext, - "Entering INCLUDE Conditional Section\n"); - } - - SKIP_BLANKS; - GROW; - while (((RAW != 0) && ((RAW != ']') || (NXT(1) != ']') || - (NXT(2) != '>'))) && (ctxt->instate != XML_PARSER_EOF)) { - const xmlChar *check = CUR_PTR; - unsigned int cons = ctxt->input->consumed; + int *inputIds = NULL; + size_t inputIdsSize = 0; + size_t depth = 0; - if ((RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { - xmlParseConditionalSections(ctxt); - } else - xmlParseMarkupDecl(ctxt); + while (ctxt->instate != XML_PARSER_EOF) { + if ((RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { + int id = ctxt->input->id; + SKIP(3); SKIP_BLANKS; - GROW; - if ((CUR_PTR == check) && (cons == ctxt->input->consumed)) { - xmlFatalErr(ctxt, XML_ERR_EXT_SUBSET_NOT_FINISHED, NULL); - xmlHaltParser(ctxt); - break; - } - } - if (xmlParserDebugEntities) { - if ((ctxt->input != NULL) && (ctxt->input->filename)) - xmlGenericError(xmlGenericErrorContext, - "%s(%d): ", ctxt->input->filename, - ctxt->input->line); - xmlGenericError(xmlGenericErrorContext, - "Leaving INCLUDE Conditional Section\n"); - } + if (CMP7(CUR_PTR, 'I', 'N', 'C', 'L', 'U', 'D', 'E')) { + SKIP(7); + SKIP_BLANKS; + if (RAW != '[') { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); + xmlHaltParser(ctxt); + goto error; + } + if (ctxt->input->id != id) { + xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, + "All markup of the conditional section is" + " not in the same entity\n"); + } + NEXT; - } else if (CMP6(CUR_PTR, 'I', 'G', 'N', 'O', 'R', 'E')) { - int state; - xmlParserInputState instate; - int depth = 0; + if (inputIdsSize <= depth) { + int *tmp; - SKIP(6); - SKIP_BLANKS; - if (RAW != '[') { - xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); - xmlHaltParser(ctxt); - return; - } else { - if (ctxt->input->id != id) { - xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, - "All markup of the conditional section is not" - " in the same entity\n"); - } - NEXT; - } - if (xmlParserDebugEntities) { - if ((ctxt->input != NULL) && (ctxt->input->filename)) - xmlGenericError(xmlGenericErrorContext, - "%s(%d): ", ctxt->input->filename, - ctxt->input->line); - xmlGenericError(xmlGenericErrorContext, - "Entering IGNORE Conditional Section\n"); - } + inputIdsSize = (inputIdsSize == 0 ? 4 : inputIdsSize * 2); + tmp = (int *) xmlRealloc(inputIds, + inputIdsSize * sizeof(int)); + if (tmp == NULL) { + xmlErrMemory(ctxt, NULL); + goto error; + } + inputIds = tmp; + } + inputIds[depth] = id; + depth++; + } else if (CMP6(CUR_PTR, 'I', 'G', 'N', 'O', 'R', 'E')) { + int state; + xmlParserInputState instate; + size_t ignoreDepth = 0; + + SKIP(6); + SKIP_BLANKS; + if (RAW != '[') { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); + xmlHaltParser(ctxt); + goto error; + } + if (ctxt->input->id != id) { + xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, + "All markup of the conditional section is" + " not in the same entity\n"); + } + NEXT; - /* - * Parse up to the end of the conditional section - * But disable SAX event generating DTD building in the meantime - */ - state = ctxt->disableSAX; - instate = ctxt->instate; - if (ctxt->recovery == 0) ctxt->disableSAX = 1; - ctxt->instate = XML_PARSER_IGNORE; + /* + * Parse up to the end of the conditional section but disable + * SAX event generating DTD building in the meantime + */ + state = ctxt->disableSAX; + instate = ctxt->instate; + if (ctxt->recovery == 0) ctxt->disableSAX = 1; + ctxt->instate = XML_PARSER_IGNORE; + + while (RAW != 0) { + if ((RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { + SKIP(3); + ignoreDepth++; + /* Check for integer overflow */ + if (ignoreDepth == 0) { + xmlErrMemory(ctxt, NULL); + goto error; + } + } else if ((RAW == ']') && (NXT(1) == ']') && + (NXT(2) == '>')) { + if (ignoreDepth == 0) + break; + SKIP(3); + ignoreDepth--; + } else { + NEXT; + } + } - while (((depth >= 0) && (RAW != 0)) && - (ctxt->instate != XML_PARSER_EOF)) { - if ((RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { - depth++; - SKIP(3); - continue; - } - if ((RAW == ']') && (NXT(1) == ']') && (NXT(2) == '>')) { - if (--depth >= 0) SKIP(3); - continue; - } - NEXT; - continue; - } + ctxt->disableSAX = state; + ctxt->instate = instate; - ctxt->disableSAX = state; - ctxt->instate = instate; + if (RAW == 0) { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_NOT_FINISHED, NULL); + goto error; + } + if (ctxt->input->id != id) { + xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, + "All markup of the conditional section is" + " not in the same entity\n"); + } + SKIP(3); + } else { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); + xmlHaltParser(ctxt); + goto error; + } + } else if ((depth > 0) && + (RAW == ']') && (NXT(1) == ']') && (NXT(2) == '>')) { + depth--; + if (ctxt->input->id != inputIds[depth]) { + xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, + "All markup of the conditional section is not" + " in the same entity\n"); + } + SKIP(3); + } else { + const xmlChar *check = CUR_PTR; + unsigned int cons = ctxt->input->consumed; - if (xmlParserDebugEntities) { - if ((ctxt->input != NULL) && (ctxt->input->filename)) - xmlGenericError(xmlGenericErrorContext, - "%s(%d): ", ctxt->input->filename, - ctxt->input->line); - xmlGenericError(xmlGenericErrorContext, - "Leaving IGNORE Conditional Section\n"); - } + xmlParseMarkupDecl(ctxt); - } else { - xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); - xmlHaltParser(ctxt); - return; - } + if ((CUR_PTR == check) && (cons == ctxt->input->consumed)) { + xmlFatalErr(ctxt, XML_ERR_EXT_SUBSET_NOT_FINISHED, NULL); + xmlHaltParser(ctxt); + goto error; + } + } - if (RAW == 0) - SHRINK; + if (depth == 0) + break; - if (RAW == 0) { - xmlFatalErr(ctxt, XML_ERR_CONDSEC_NOT_FINISHED, NULL); - } else { - if (ctxt->input->id != id) { - xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, - "All markup of the conditional section is not in" - " the same entity\n"); - } - if ((ctxt-> instate != XML_PARSER_EOF) && - ((ctxt->input->cur + 3) <= ctxt->input->end)) - SKIP(3); + SKIP_BLANKS; + GROW; } + +error: + xmlFree(inputIds); } /** @@ -6810,21 +6831,11 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) { /* * detect requirement to exit there and act accordingly - * and avoid having instate overriden later on + * and avoid having instate overridden later on */ if (ctxt->instate == XML_PARSER_EOF) return; - /* - * Conditional sections are allowed from entities included - * by PE References in the internal subset. - */ - if ((ctxt->external == 0) && (ctxt->inputNr > 1)) { - if ((RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { - xmlParseConditionalSections(ctxt); - } - } - ctxt->instate = XML_PARSER_DTD; } @@ -7009,7 +7020,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { */ if (NXT(1) == '#') { int i = 0; - xmlChar out[10]; + xmlChar out[16]; int hex = NXT(2); int value = xmlParseCharRef(ctxt); @@ -7086,7 +7097,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { - unsigned long oldnbent = ctxt->nbentities; + unsigned long oldnbent = ctxt->nbentities, diff; /* * This is a bit hackish but this seems the best @@ -7127,7 +7138,10 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { * Store the number of entities needing parsing for this entity * content and do checkings */ - ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; + diff = ctxt->nbentities - oldnbent + 1; + if (diff > INT_MAX / 2) + diff = INT_MAX / 2; + ent->checked = diff * 2; if ((ent->content != NULL) && (xmlStrchr(ent->content, '<'))) ent->checked |= 1; if (ret == XML_ERR_ENTITY_LOOP) { @@ -7675,7 +7689,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { } /* - * Increate the number of entity references parsed + * Increase the number of entity references parsed */ ctxt->nbentities++; @@ -7851,7 +7865,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) NEXT; /* - * Increate the number of entity references parsed + * Increase the number of entity references parsed */ ctxt->nbentities++; @@ -8117,7 +8131,7 @@ xmlParseStringPEReference(xmlParserCtxtPtr ctxt, const xmlChar **str) { ptr++; /* - * Increate the number of entity references parsed + * Increase the number of entity references parsed */ ctxt->nbentities++; @@ -8285,6 +8299,15 @@ xmlParseInternalSubset(xmlParserCtxtPtr ctxt) { xmlParseMarkupDecl(ctxt); xmlParsePEReference(ctxt); + /* + * Conditional sections are allowed from external entities included + * by PE References in the internal subset. + */ + if ((ctxt->inputNr > 1) && (ctxt->input->filename != NULL) && + (RAW == '<') && (NXT(1) == '!') && (NXT(2) == '[')) { + xmlParseConditionalSections(ctxt); + } + if ((CUR_PTR == check) && (cons == ctxt->input->consumed)) { xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "xmlParseInternalSubset: error detected in Markup declaration\n"); @@ -8713,12 +8736,16 @@ xmlParseQName(xmlParserCtxtPtr ctxt, const xmlChar **prefix) { if (l == NULL) { xmlChar *tmp; + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); xmlNsErr(ctxt, XML_NS_ERR_QNAME, "Failed to parse QName '%s:'\n", p, NULL, NULL); l = xmlParseNmtoken(ctxt); - if (l == NULL) + if (l == NULL) { + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); tmp = xmlBuildQName(BAD_CAST "", p, NULL, 0); - else { + } else { tmp = xmlBuildQName(l, p, NULL, 0); xmlFree((char *)l); } @@ -8741,6 +8768,8 @@ xmlParseQName(xmlParserCtxtPtr ctxt, const xmlChar **prefix) { *prefix = p; return(l); } + if (ctxt->instate == XML_PARSER_EOF) + return(NULL); tmp = xmlBuildQName(BAD_CAST "", l, NULL, 0); l = xmlDictLookup(ctxt->dict, tmp, -1); if (tmp != NULL) xmlFree(tmp); @@ -8840,6 +8869,18 @@ xmlParseQNameAndCompare(xmlParserCtxtPtr ctxt, xmlChar const *name, * caller if it was copied, this can be detected by val[*len] == 0. */ +#define GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) \ + const xmlChar *oldbase = ctxt->input->base;\ + GROW;\ + if (ctxt->instate == XML_PARSER_EOF)\ + return(NULL);\ + if (oldbase != ctxt->input->base) {\ + ptrdiff_t delta = ctxt->input->base - oldbase;\ + start = start + delta;\ + in = in + delta;\ + }\ + end = ctxt->input->end; + static xmlChar * xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, int normalize) @@ -8869,14 +8910,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, end = ctxt->input->end; start = in; if (in >= end) { - const xmlChar *oldbase = ctxt->input->base; - GROW; - if (oldbase != ctxt->input->base) { - long delta = ctxt->input->base - oldbase; - start = start + delta; - in = in + delta; - } - end = ctxt->input->end; + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) } if (normalize) { /* @@ -8893,16 +8927,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, in++; start = in; if (in >= end) { - const xmlChar *oldbase = ctxt->input->base; - GROW; - if (ctxt->instate == XML_PARSER_EOF) - return(NULL); - if (oldbase != ctxt->input->base) { - long delta = ctxt->input->base - oldbase; - start = start + delta; - in = in + delta; - } - end = ctxt->input->end; + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) if (((in - start) > XML_MAX_TEXT_LENGTH) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, @@ -8916,16 +8941,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, col++; if ((*in++ == 0x20) && (*in == 0x20)) break; if (in >= end) { - const xmlChar *oldbase = ctxt->input->base; - GROW; - if (ctxt->instate == XML_PARSER_EOF) - return(NULL); - if (oldbase != ctxt->input->base) { - long delta = ctxt->input->base - oldbase; - start = start + delta; - in = in + delta; - } - end = ctxt->input->end; + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) if (((in - start) > XML_MAX_TEXT_LENGTH) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, @@ -8954,7 +8970,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, if (ctxt->instate == XML_PARSER_EOF) return(NULL); if (oldbase != ctxt->input->base) { - long delta = ctxt->input->base - oldbase; + ptrdiff_t delta = ctxt->input->base - oldbase; start = start + delta; in = in + delta; last = last + delta; @@ -8981,16 +8997,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc, in++; col++; if (in >= end) { - const xmlChar *oldbase = ctxt->input->base; - GROW; - if (ctxt->instate == XML_PARSER_EOF) - return(NULL); - if (oldbase != ctxt->input->base) { - long delta = ctxt->input->base - oldbase; - start = start + delta; - in = in + delta; - } - end = ctxt->input->end; + GROW_PARSE_ATT_VALUE_INTERNAL(ctxt, in, start, end) if (((in - start) > XML_MAX_TEXT_LENGTH) && ((ctxt->options & XML_PARSE_HUGE) == 0)) { xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, @@ -9084,7 +9091,7 @@ xmlParseAttribute2(xmlParserCtxtPtr ctxt, if (normalize) { /* * Sometimes a second normalisation pass for spaces is needed - * but that only happens if charrefs or entities refernces + * but that only happens if charrefs or entities references * have been used in the attribute value, i.e. the attribute * value have been extracted in an allocated string already. */ @@ -9247,7 +9254,8 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const xmlChar **pref, xmlErrMemory(ctxt, "dictionary allocation failure"); if ((attvalue != NULL) && (alloc != 0)) xmlFree(attvalue); - return(NULL); + localname = NULL; + goto done; } if (*URL != 0) { uri = xmlParseURI((const char *) URL); @@ -9497,7 +9505,8 @@ next_attr: if ((atts == NULL) || (nbatts + 5 > maxatts)) { if (xmlCtxtGrowAttrs(ctxt, nbatts + 5) < 0) { - return(NULL); + localname = NULL; + goto done; } maxatts = ctxt->maxatts; atts = ctxt->atts; @@ -9807,9 +9816,10 @@ xmlParseCDSect(xmlParserCtxtPtr ctxt) { void xmlParseContent(xmlParserCtxtPtr ctxt) { + int nameNr = ctxt->nameNr; + GROW; while ((RAW != 0) && - ((RAW != '<') || (NXT(1) != '/')) && (ctxt->instate != XML_PARSER_EOF)) { const xmlChar *test = CUR_PTR; unsigned int cons = ctxt->input->consumed; @@ -9843,7 +9853,13 @@ xmlParseContent(xmlParserCtxtPtr ctxt) { * Fourth case : a sub-element. */ else if (*cur == '<') { - xmlParseElement(ctxt); + if (NXT(1) == '/') { + if (ctxt->nameNr <= nameNr) + break; + xmlParseElementEnd(ctxt); + } else { + xmlParseElementStart(ctxt); + } } /* @@ -9878,7 +9894,7 @@ xmlParseContent(xmlParserCtxtPtr ctxt) { * xmlParseElement: * @ctxt: an XML parser context * - * parse an XML element, this is highly recursive + * parse an XML element * * [39] element ::= EmptyElemTag | STag content ETag * @@ -9890,6 +9906,23 @@ xmlParseContent(xmlParserCtxtPtr ctxt) { void xmlParseElement(xmlParserCtxtPtr ctxt) { + if (xmlParseElementStart(ctxt) != 0) + return; + xmlParseContent(ctxt); + if (ctxt->instate == XML_PARSER_EOF) + return; + xmlParseElementEnd(ctxt); +} + +/** + * xmlParseElementStart: + * @ctxt: an XML parser context + * + * Parse the start of an XML element. Returns -1 in case of error, 0 if an + * opening tag was parsed, 1 if an empty element was parsed. + */ +static int +xmlParseElementStart(xmlParserCtxtPtr ctxt) { const xmlChar *name; const xmlChar *prefix = NULL; const xmlChar *URI = NULL; @@ -9904,7 +9937,7 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { "Excessive depth in document: %d use XML_PARSE_HUGE option\n", xmlParserMaxDepth); xmlHaltParser(ctxt); - return; + return(-1); } /* Capture start position */ @@ -9931,12 +9964,17 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { name = xmlParseStartTag(ctxt); #endif /* LIBXML_SAX1_ENABLED */ if (ctxt->instate == XML_PARSER_EOF) - return; + return(-1); if (name == NULL) { spacePop(ctxt); - return; + return(-1); } - namePush(ctxt, name); + if (ctxt->sax2) + nameNsPush(ctxt, name, prefix, URI, ctxt->nsNr - nsNr); +#ifdef LIBXML_SAX1_ENABLED + else + namePush(ctxt, name); +#endif /* LIBXML_SAX1_ENABLED */ ret = ctxt->node; #ifdef LIBXML_VALID_ENABLED @@ -9977,7 +10015,7 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { node_info.node = ret; xmlParserAddNodeInfo(ctxt, &node_info); } - return; + return(1); } if (RAW == '>') { NEXT1; @@ -10005,41 +10043,39 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { node_info.node = ret; xmlParserAddNodeInfo(ctxt, &node_info); } - return; + return(-1); } - /* - * Parse the content of the element: - */ - xmlParseContent(ctxt); - if (ctxt->instate == XML_PARSER_EOF) - return; - if (!IS_BYTE_CHAR(RAW)) { - xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED, - "Premature end of data in tag %s line %d\n", - name, line, NULL); + return(0); +} - /* - * end of parsing of this node. - */ - nodePop(ctxt); - namePop(ctxt); - spacePop(ctxt); - if (nsNr != ctxt->nsNr) - nsPop(ctxt, ctxt->nsNr - nsNr); - return; - } +/** + * xmlParseElementEnd: + * @ctxt: an XML parser context + * + * Parse the end of an XML element. + */ +static void +xmlParseElementEnd(xmlParserCtxtPtr ctxt) { + xmlParserNodeInfo node_info; + xmlNodePtr ret = ctxt->node; + + if (ctxt->nameNr <= 0) + return; /* * parse the end of tag: '</' should be here. */ if (ctxt->sax2) { - xmlParseEndTag2(ctxt, prefix, URI, line, ctxt->nsNr - nsNr, tlen); + const xmlChar *prefix = ctxt->pushTab[ctxt->nameNr * 3 - 3]; + const xmlChar *URI = ctxt->pushTab[ctxt->nameNr * 3 - 2]; + int nsNr = (ptrdiff_t) ctxt->pushTab[ctxt->nameNr * 3 - 1]; + xmlParseEndTag2(ctxt, prefix, URI, 0, nsNr, 0); namePop(ctxt); } #ifdef LIBXML_SAX1_ENABLED - else - xmlParseEndTag1(ctxt, line); + else + xmlParseEndTag1(ctxt, 0); #endif /* LIBXML_SAX1_ENABLED */ /* @@ -10281,7 +10317,7 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) { } /* - * UTF-16 encoding stwich has already taken place at this stage, + * UTF-16 encoding switch has already taken place at this stage, * more over the little-endian/big-endian selection is already done */ if ((encoding != NULL) && @@ -11164,7 +11200,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { else { /* * If we are operating on converted input, try to flush - * remainng chars to avoid them stalling in the non-converted + * remaining chars to avoid them stalling in the non-converted * buffer. But do not do this in document start where * encoding="..." may not have been read and we work on a * guessed encoding. @@ -12356,13 +12392,6 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, return(NULL); } ctxt->dictNames = 1; - ctxt->pushTab = (void **) xmlMalloc(ctxt->nameMax * 3 * sizeof(xmlChar *)); - if (ctxt->pushTab == NULL) { - xmlErrMemory(ctxt, NULL); - xmlFreeParserInputBuffer(buf); - xmlFreeParserCtxt(ctxt); - return(NULL); - } if (sax != NULL) { #ifdef LIBXML_SAX1_ENABLED if (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler) @@ -13898,7 +13927,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, xmlSAXHandlerPtr sax, xmlFreeParserCtxt(ctxt); newDoc->intSubset = NULL; newDoc->extSubset = NULL; - newDoc->oldNs = NULL; + if(doc != NULL) + newDoc->oldNs = NULL; xmlFreeDoc(newDoc); return(ret); @@ -14007,6 +14037,10 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID, ctxt->input_id = pctx->input_id + 1; } + /* Don't read from stdin. */ + if (xmlStrcmp(URL, BAD_CAST "-") == 0) + URL = BAD_CAST "./-"; + uri = xmlBuildURI(URL, base); if (uri == NULL) { @@ -14939,16 +14973,6 @@ xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk, xmlCtxtReset(ctxt); - if (ctxt->pushTab == NULL) { - ctxt->pushTab = (void **) xmlMalloc(ctxt->nameMax * 3 * - sizeof(xmlChar *)); - if (ctxt->pushTab == NULL) { - xmlErrMemory(ctxt, NULL); - xmlFreeParserInputBuffer(buf); - return(1); - } - } - if (filename == NULL) { ctxt->directory = NULL; } else { diff --git a/sdk/lib/3rdparty/libxml2/parserInternals.c b/sdk/lib/3rdparty/libxml2/parserInternals.c index 0f015dede12..b00cd08ec27 100644 --- a/sdk/lib/3rdparty/libxml2/parserInternals.c +++ b/sdk/lib/3rdparty/libxml2/parserInternals.c @@ -703,7 +703,7 @@ encoding_error: /* * An encoding problem may arise from a truncated input buffer * splitting a character in the middle. In that case do not raise - * an error but return 0 to endicate an end of stream problem + * an error but return 0 to indicate an end of stream problem */ if (ctxt->input->end - ctxt->input->cur < 4) { *len = 0; @@ -816,7 +816,7 @@ encoding_error: /* * An encoding problem may arise from a truncated input buffer * splitting a character in the middle. In that case do not raise - * an error but return 0 to endicate an end of stream problem + * an error but return 0 to indicate an end of stream problem */ if ((ctxt == NULL) || (ctxt->input == NULL) || (ctxt->input->end - ctxt->input->cur < 4)) { @@ -1093,7 +1093,7 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc) } } /* - * TODO: We could recover from errors in external entites if we + * TODO: We could recover from errors in external entities if we * didn't stop the parser. But most callers of this function don't * check the return value. */ @@ -1138,7 +1138,7 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, if (input->buf != NULL) { if (input->buf->encoder != NULL) { /* - * Check in case the auto encoding detetection triggered + * Check in case the auto encoding detection triggered * in already. */ if (input->buf->encoder == handler) diff --git a/sdk/lib/3rdparty/libxml2/pattern.c b/sdk/lib/3rdparty/libxml2/pattern.c index 0eb8d81244d..27e96946b69 100644 --- a/sdk/lib/3rdparty/libxml2/pattern.c +++ b/sdk/lib/3rdparty/libxml2/pattern.c @@ -1,5 +1,5 @@ /* - * pattern.c: Implemetation of selectors for nodes + * pattern.c: Implementation of selectors for nodes * * Reference: * http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/ @@ -55,7 +55,7 @@ /* * NOTE: Those private flags (XML_STREAM_xxx) are used * in _xmlStreamCtxt->flag. They extend the public -* xmlPatternFlags, so be carefull not to interfere with the +* xmlPatternFlags, so be careful not to interfere with the * reserved values for xmlPatternFlags. */ #define XML_STREAM_FINAL_IS_ANY_NODE 1<<14 @@ -229,13 +229,16 @@ xmlNewPattern(void) { */ void xmlFreePattern(xmlPatternPtr comp) { + xmlFreePatternList(comp); +} + +static void +xmlFreePatternInternal(xmlPatternPtr comp) { xmlStepOpPtr op; int i; if (comp == NULL) return; - if (comp->next != NULL) - xmlFreePattern(comp->next); if (comp->stream != NULL) xmlFreeStreamComp(comp->stream); if (comp->pattern != NULL) @@ -273,7 +276,7 @@ xmlFreePatternList(xmlPatternPtr comp) { cur = comp; comp = comp->next; cur->next = NULL; - xmlFreePattern(cur); + xmlFreePatternInternal(cur); } } @@ -742,7 +745,7 @@ rollback: * xmlPatScanLiteral: * @ctxt: the XPath Parser context * - * Parse an XPath Litteral: + * Parse an XPath Literal: * * [29] Literal ::= '"' [^"]* '"' * | "'" [^']* "'" @@ -1973,7 +1976,7 @@ xmlStreamPushInternal(xmlStreamCtxtPtr stream, } else { /* * If there are "//", then we need to process every "//" - * occuring in the states, plus any other state for this + * occurring in the states, plus any other state for this * level. */ stepNr = stream->states[2 * i]; diff --git a/sdk/lib/3rdparty/libxml2/relaxng.c b/sdk/lib/3rdparty/libxml2/relaxng.c index 914706ac168..13fd954c7dd 100644 --- a/sdk/lib/3rdparty/libxml2/relaxng.c +++ b/sdk/lib/3rdparty/libxml2/relaxng.c @@ -125,11 +125,11 @@ typedef enum { XML_RELAXNG_EXCEPT, /* except present in nameclass defs */ XML_RELAXNG_TEXT, /* textual content */ XML_RELAXNG_ELEMENT, /* an element */ - XML_RELAXNG_DATATYPE, /* extenal data type definition */ - XML_RELAXNG_PARAM, /* extenal data type parameter */ - XML_RELAXNG_VALUE, /* value from an extenal data type definition */ + XML_RELAXNG_DATATYPE, /* external data type definition */ + XML_RELAXNG_PARAM, /* external data type parameter */ + XML_RELAXNG_VALUE, /* value from an external data type definition */ XML_RELAXNG_LIST, /* a list of patterns */ - XML_RELAXNG_ATTRIBUTE, /* an attrbute following a pattern */ + XML_RELAXNG_ATTRIBUTE, /* an attribute following a pattern */ XML_RELAXNG_DEF, /* a definition */ XML_RELAXNG_REF, /* reference to a definition */ XML_RELAXNG_EXTERNALREF, /* reference to an external def */ @@ -228,7 +228,7 @@ struct _xmlRelaxNGParserCtxt { xmlDocPtr document; int defNr; /* number of defines used */ - int defMax; /* number of defines aloocated */ + int defMax; /* number of defines allocated */ xmlRelaxNGDefinePtr *defTab; /* pointer to the allocated definitions */ const char *buffer; @@ -1128,7 +1128,7 @@ xmlRelaxNGAddStates(xmlRelaxNGValidCtxtPtr ctxt, /** * xmlRelaxNGFreeStates: * @ctxt: a Relax-NG validation context - * @states: teh container + * @states: the container * * Free a RelaxNG validation state container */ @@ -1340,7 +1340,7 @@ xmlRelaxNGCopyValidState(xmlRelaxNGValidCtxtPtr ctxt, * * Compare the validation states for equality * - * Returns 1 if equald, 0 otherwise + * Returns 1 if equal, 0 otherwise */ static int xmlRelaxNGEqualValidState(xmlRelaxNGValidCtxtPtr ctxt ATTRIBUTE_UNUSED, @@ -2815,7 +2815,7 @@ xmlRelaxNGRegisterTypeLibrary(const xmlChar * namespace, void *data, /** * xmlRelaxNGInitTypes: * - * Initilize the default type libraries. + * Initialize the default type libraries. * * Returns 0 in case of success and -1 in case of error. */ @@ -2878,7 +2878,7 @@ static int xmlRelaxNGTryCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGDefinePtr def); /** - * xmlRelaxNGIsCompileable: + * xmlRelaxNGIsCompilable: * @define: the definition to check * * Check if a definition is nullable. @@ -2886,7 +2886,7 @@ static int xmlRelaxNGTryCompile(xmlRelaxNGParserCtxtPtr ctxt, * Returns 1 if yes, 0 if no and -1 in case of error */ static int -xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) +xmlRelaxNGIsCompilable(xmlRelaxNGDefinePtr def) { int ret = -1; @@ -2901,7 +2901,7 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) return (0); switch (def->type) { case XML_RELAXNG_NOOP: - ret = xmlRelaxNGIsCompileable(def->content); + ret = xmlRelaxNGIsCompilable(def->content); break; case XML_RELAXNG_TEXT: case XML_RELAXNG_EMPTY: @@ -2909,7 +2909,7 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) break; case XML_RELAXNG_ELEMENT: /* - * Check if the element content is compileable + * Check if the element content is compilable */ if (((def->dflags & IS_NOT_COMPILABLE) == 0) && ((def->dflags & IS_COMPILABLE) == 0)) { @@ -2917,7 +2917,7 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) list = def->content; while (list != NULL) { - ret = xmlRelaxNGIsCompileable(list); + ret = xmlRelaxNGIsCompilable(list); if (ret != 1) break; list = list->next; @@ -2943,13 +2943,13 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) def->name); } else { xmlGenericError(xmlGenericErrorContext, - "Problem in RelaxNGIsCompileable for element %s\n", + "Problem in RelaxNGIsCompilable for element %s\n", def->name); } #endif } /* - * All elements return a compileable status unless they + * All elements return a compilable status unless they * are generic like anyName */ if ((def->nameClass != NULL) || (def->name == NULL)) @@ -2968,7 +2968,7 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) def->depth = -20; list = def->content; while (list != NULL) { - ret = xmlRelaxNGIsCompileable(list); + ret = xmlRelaxNGIsCompilable(list); if (ret != 1) break; list = list->next; @@ -2986,7 +2986,7 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) list = def->content; while (list != NULL) { - ret = xmlRelaxNGIsCompileable(list); + ret = xmlRelaxNGIsCompilable(list); if (ret != 1) break; list = list->next; @@ -3011,15 +3011,15 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def) #ifdef DEBUG_COMPILE if (ret == 1) { xmlGenericError(xmlGenericErrorContext, - "RelaxNGIsCompileable %s : true\n", + "RelaxNGIsCompilable %s : true\n", xmlRelaxNGDefName(def)); } else if (ret == 0) { xmlGenericError(xmlGenericErrorContext, - "RelaxNGIsCompileable %s : false\n", + "RelaxNGIsCompilable %s : false\n", xmlRelaxNGDefName(def)); } else { xmlGenericError(xmlGenericErrorContext, - "Problem in RelaxNGIsCompileable %s\n", + "Problem in RelaxNGIsCompilable %s\n", xmlRelaxNGDefName(def)); } #endif @@ -3047,7 +3047,7 @@ xmlRelaxNGCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGDefinePtr def) switch (def->type) { case XML_RELAXNG_START: - if ((xmlRelaxNGIsCompileable(def) == 1) && (def->depth != -25)) { + if ((xmlRelaxNGIsCompilable(def) == 1) && (def->depth != -25)) { xmlAutomataPtr oldam = ctxt->am; xmlAutomataStatePtr oldstate = ctxt->state; @@ -3273,7 +3273,7 @@ xmlRelaxNGTryCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGDefinePtr def) if ((def->type == XML_RELAXNG_START) || (def->type == XML_RELAXNG_ELEMENT)) { - ret = xmlRelaxNGIsCompileable(def); + ret = xmlRelaxNGIsCompilable(def); if ((def->dflags & IS_COMPILABLE) && (def->depth != -25)) { ctxt->am = NULL; ret = xmlRelaxNGCompile(ctxt, def); @@ -3478,7 +3478,7 @@ xmlRelaxNGIsBlank(xmlChar * str) * * Applies algorithm from 4.3. datatypeLibrary attribute * - * Returns the datatypeLibary value or NULL if not found + * Returns the datatypeLibrary value or NULL if not found */ static xmlChar * xmlRelaxNGGetDataTypeLibrary(xmlRelaxNGParserCtxtPtr ctxt ATTRIBUTE_UNUSED, @@ -3788,7 +3788,7 @@ static const xmlChar *invalidName = BAD_CAST "\1"; * that if both lists do not accept the same QNames, it returns 1 * If the 2 lists can accept the same QName the comparison returns 0 * - * Returns 1 disttinct, 0 if equal + * Returns 1 distinct, 0 if equal */ static int xmlRelaxNGCompareNameClasses(xmlRelaxNGDefinePtr def1, @@ -3889,7 +3889,7 @@ xmlRelaxNGCompareNameClasses(xmlRelaxNGDefinePtr def1, * is that if both lists do not accept the same QNames, it returns 1 * If the 2 lists can accept the same QName the comparison returns 0 * - * Returns 1 disttinct, 0 if equal + * Returns 1 distinct, 0 if equal */ static int xmlRelaxNGCompareElemDefLists(xmlRelaxNGParserCtxtPtr ctxt @@ -4743,9 +4743,9 @@ xmlRelaxNGParseImportRefs(xmlRelaxNGParserCtxtPtr ctxt, /** * xmlRelaxNGProcessExternalRef: * @ctxt: the parser context - * @node: the externlRef node + * @node: the externalRef node * - * Process and compile an externlRef node + * Process and compile an externalRef node * * Returns the xmlRelaxNGDefinePtr or NULL in case of error */ @@ -5548,12 +5548,16 @@ xmlRelaxNGParsePatterns(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr nodes, while (nodes != NULL) { if (IS_RELAXNG(nodes, "element")) { cur = xmlRelaxNGParseElement(ctxt, nodes); + if (cur == NULL) + return (NULL); if (def == NULL) { def = last = cur; } else { if ((group == 1) && (def->type == XML_RELAXNG_ELEMENT) && (def == last)) { def = xmlRelaxNGNewDefine(ctxt, nodes); + if (def == NULL) + return (NULL); def->type = XML_RELAXNG_GROUP; def->content = last; } @@ -6012,7 +6016,7 @@ xmlRelaxNGCheckCycles(xmlRelaxNGParserCtxtPtr ctxt, * @parent: the parent definition * @prev: the previous sibling definition * - * Try to unlink a definition. If not possble make it a NOOP + * Try to unlink a definition. If not possible make it a NOOP * * Returns the new prev definition */ @@ -6395,7 +6399,10 @@ xmlRelaxNGCheckRules(xmlRelaxNGParserCtxtPtr ctxt, NULL, NULL); } if ((!(flags & XML_RELAXNG_IN_ONEORMORE)) - && (cur->name == NULL)) { + && cur->name == NULL + /* following is checking alternative name class readiness + in case it went the "choice" route */ + && cur->nameClass == NULL) { if (cur->ns == NULL) { xmlRngPErr(ctxt, cur->node, XML_RNGP_ANYNAME_ATTR_ANCESTOR, "Found anyName attribute without oneOrMore ancestor\n", @@ -6659,7 +6666,7 @@ xmlRelaxNGParseGrammar(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr nodes) * @node: the root node of the RelaxNG schema * * parse a Relax-NG definition resource and build an internal - * xmlRelaxNG struture which can be used to validate instances. + * xmlRelaxNG structure which can be used to validate instances. * * Returns the internal XML RelaxNG structure built or * NULL in case of error @@ -7490,7 +7497,7 @@ xmlRelaxNGCleanupDoc(xmlRelaxNGParserCtxtPtr ctxt, xmlDocPtr doc) * @ctxt: a Relax-NG parser context * * parse a schema definition resource and build an internal - * XML Shema struture which can be used to validate instances. + * XML Schema structure which can be used to validate instances. * * Returns the internal XML RelaxNG structure built from the resource or * NULL in case of error @@ -8603,7 +8610,7 @@ xmlRelaxNGNormalize(xmlRelaxNGValidCtxtPtr ctxt, const xmlChar * str) * @type: the datatype definition * @node: the node * - * Validate the given value against the dataype + * Validate the given value against the datatype * * Returns 0 if the validation succeeded or an error code. */ @@ -9476,7 +9483,17 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGFreeValidState(ctxt, oldstate); oldstate = ctxt->state; ctxt->state = NULL; - if (cur != NULL) { + if (cur != NULL + /* there's a nasty violation of context-free unambiguities, + since in open-name-class context, interleave in the + production shall finish without caring about anything + else that is OK to follow in that case -- it would + otherwise get marked as "extra content" and would + hence fail the validation, hence this perhaps + dirty attempt to rectify such a situation */ + && (define->parent->type != XML_RELAXNG_DEF + || !xmlStrEqual(define->parent->name, + (const xmlChar *) "open-name-class"))) { VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); ret = -1; ctxt->state = oldstate; @@ -9749,7 +9766,7 @@ xmlRelaxNGElementMatch(xmlRelaxNGValidCtxtPtr ctxt, * Find the "best" state in the ctxt->states list of states to report * errors about. I.e. a state with no element left in the child list * or the one with the less attributes left. - * This is called only if a falidation error was detected + * This is called only if a validation error was detected * * Returns the index of the "best" state or -1 in case of error */ @@ -9891,7 +9908,6 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt, ctxt->depth++; switch (define->type) { case XML_RELAXNG_EMPTY: - xmlRelaxNGSkipIgnored(ctxt, node); ret = 0; break; case XML_RELAXNG_NOT_ALLOWED: @@ -10357,7 +10373,7 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt, /* * Something we can optimize cleanly there is only one - * possble branch out ! + * possible branch out ! */ if ((node->type == XML_TEXT_NODE) || (node->type == XML_CDATA_SECTION_NODE)) { @@ -10610,7 +10626,7 @@ xmlRelaxNGValidateState(xmlRelaxNGValidCtxtPtr ctxt, if (define->name != NULL) xmlGenericError(xmlGenericErrorContext, "%s ", define->name); if (ret == 0) - xmlGenericError(xmlGenericErrorContext, "suceeded\n"); + xmlGenericError(xmlGenericErrorContext, "succeeded\n"); else xmlGenericError(xmlGenericErrorContext, "failed\n"); #endif diff --git a/sdk/lib/3rdparty/libxml2/save.h b/sdk/lib/3rdparty/libxml2/save.h index 2c32a103998..192b6741335 100644 --- a/sdk/lib/3rdparty/libxml2/save.h +++ b/sdk/lib/3rdparty/libxml2/save.h @@ -1,7 +1,7 @@ /* * Summary: Internal Interfaces for saving in libxml2 * Description: this module describes a few interfaces which were - * addded along with the API changes in 2.9.0 + * added along with the API changes in 2.9.0 * those are private routines at this point * * Copy: See Copyright for the status of this software. @@ -25,9 +25,10 @@ void xmlBufDumpNotationTable(xmlBufPtr buf, xmlNotationTablePtr table); void xmlBufDumpElementDecl(xmlBufPtr buf, xmlElementPtr elem); void xmlBufDumpAttributeDecl(xmlBufPtr buf, xmlAttributePtr attr); void xmlBufDumpEntityDecl(xmlBufPtr buf, xmlEntityPtr ent); -xmlChar *xmlEncodeAttributeEntities(xmlDocPtr doc, const xmlChar *input); #endif +xmlChar *xmlEncodeAttributeEntities(xmlDocPtr doc, const xmlChar *input); + #ifdef __cplusplus } #endif diff --git a/sdk/lib/3rdparty/libxml2/schematron.c b/sdk/lib/3rdparty/libxml2/schematron.c index 6200f2d4130..258ce4091f0 100644 --- a/sdk/lib/3rdparty/libxml2/schematron.c +++ b/sdk/lib/3rdparty/libxml2/schematron.c @@ -1068,7 +1068,7 @@ done: * @ctxt: a schema validation context * * parse a schema definition resource and build an internal - * XML Shema struture which can be used to validate instances. + * XML Schema structure which can be used to validate instances. * * Returns the internal XML Schematron structure built from the resource or * NULL in case of error @@ -1287,7 +1287,7 @@ xmlSchematronReportOutput(xmlSchematronValidCtxtPtr ctxt ATTRIBUTE_UNUSED, * Build the string being reported to the user. * * Returns a report string or NULL in case of error. The string needs - * to be deallocated by teh caller + * to be deallocated by the caller */ static xmlChar * xmlSchematronFormatReport(xmlSchematronValidCtxtPtr ctxt, @@ -1591,7 +1591,7 @@ xmlSchematronNextNode(xmlNodePtr cur) { * xmlSchematronRunTest: * @ctxt: the schema validation context * @test: the current test - * @instance: the document instace tree + * @instance: the document instance tree * @cur: the current node in the instance * * Validate a rule against a tree instance at a given position @@ -1655,7 +1655,7 @@ xmlSchematronRunTest(xmlSchematronValidCtxtPtr ctxt, /** * xmlSchematronValidateDoc: * @ctxt: the schema validation context - * @instance: the document instace tree + * @instance: the document instance tree * * Validate a tree instance against the schematron * diff --git a/sdk/lib/3rdparty/libxml2/threads.c b/sdk/lib/3rdparty/libxml2/threads.c index 2d803b803de..72df9ba9979 100644 --- a/sdk/lib/3rdparty/libxml2/threads.c +++ b/sdk/lib/3rdparty/libxml2/threads.c @@ -27,8 +27,8 @@ #ifdef HAVE_PTHREAD_H #include <pthread.h> #elif defined HAVE_WIN32_THREADS -//#define WIN32_LEAN_AND_MEAN -//#include <windows.h> +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #ifndef HAVE_COMPILER_TLS #include <process.h> #endif @@ -82,7 +82,7 @@ static int libxml_is_threaded = 1; /* * TODO: this module still uses malloc/free and not xmlMalloc/xmlFree - * to avoid some crazyness since xmlMalloc/xmlFree may actually + * to avoid some craziness since xmlMalloc/xmlFree may actually * be hosted on allocated blocks needing them for the allocation ... */ @@ -239,7 +239,7 @@ xmlMutexLock(xmlMutexPtr tok) if (acquire_sem(tok->sem) != B_NO_ERROR) { #ifdef DEBUG_THREADS xmlGenericError(xmlGenericErrorContext, - "xmlMutexLock():BeOS:Couldn't aquire semaphore\n"); + "xmlMutexLock():BeOS:Couldn't acquire semaphore\n"); #endif } tok->tid = find_thread(NULL); diff --git a/sdk/lib/3rdparty/libxml2/timsort.h b/sdk/lib/3rdparty/libxml2/timsort.h index 0c6346b8a6e..383584fb35f 100644 --- a/sdk/lib/3rdparty/libxml2/timsort.h +++ b/sdk/lib/3rdparty/libxml2/timsort.h @@ -59,7 +59,7 @@ typedef unsigned __int64 uint64_t; #define SORT_SWAP(x,y) {SORT_TYPE __SORT_SWAP_t = (x); (x) = (y); (y) = __SORT_SWAP_t;} -/* Common, type-agnosting functions and constants that we don't want to declare twice. */ +/* Common, type-agnostic functions and constants that we don't want to declare twice. */ #ifndef SORT_COMMON_H #define SORT_COMMON_H @@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t; static int compute_minrun(const uint64_t); #ifndef CLZ -#ifdef __GNUC__ +#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ > 3)) #define CLZ __builtin_clzll #else @@ -404,7 +404,8 @@ static void TIM_SORT_MERGE(SORT_TYPE *dst, const TIM_SORT_RUN_T *stack, const in j = curr + A; k = curr + A + B; - while (k-- > curr) { + while (k > curr) { + k--; if ((i > 0) && (j > curr)) { if (SORT_CMP(dst[j - 1], storage[i - 1]) > 0) { dst[k] = dst[--j]; diff --git a/sdk/lib/3rdparty/libxml2/tree.c b/sdk/lib/3rdparty/libxml2/tree.c index 959421bd652..08b1a5004df 100644 --- a/sdk/lib/3rdparty/libxml2/tree.c +++ b/sdk/lib/3rdparty/libxml2/tree.c @@ -59,7 +59,7 @@ int __xmlRegisterCallbacks = 0; ************************************************************************/ static xmlNsPtr -xmlNewReconciliedNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns); +xmlNewReconciledNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns); static xmlChar* xmlGetPropNodeValueInternal(const xmlAttr *prop); @@ -181,7 +181,7 @@ xmlGetEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) { * @dtd: A pointer to the DTD to search * @name: The entity name * - * Do an entity lookup in the DTD pararmeter entity hash table and + * Do an entity lookup in the DTD parameter entity hash table and * return the corresponding entity, if found. * * Returns A pointer to the entity structure or NULL if not found. @@ -2950,7 +2950,7 @@ xmlNewChild(xmlNodePtr parent, xmlNsPtr ns, * Add a new attribute after @prev using @cur as base attribute. * When inserting before @cur, @prev is passed as @cur->prev. * When inserting after @cur, @prev is passed as @cur. - * If an existing attribute is found it is detroyed prior to adding @prop. + * If an existing attribute is found it is destroyed prior to adding @prop. * * Returns the attribute being inserted or NULL in case of error. */ @@ -3664,7 +3664,9 @@ xmlNextElementSibling(xmlNodePtr node) { void xmlFreeNodeList(xmlNodePtr cur) { xmlNodePtr next; + xmlNodePtr parent; xmlDictPtr dict = NULL; + size_t depth = 0; if (cur == NULL) return; if (cur->type == XML_NAMESPACE_DECL) { @@ -3680,16 +3682,21 @@ xmlFreeNodeList(xmlNodePtr cur) { return; } if (cur->doc != NULL) dict = cur->doc->dict; - while (cur != NULL) { + while (1) { + while ((cur->children != NULL) && + (cur->type != XML_DTD_NODE) && + (cur->type != XML_ENTITY_REF_NODE)) { + cur = cur->children; + depth += 1; + } + next = cur->next; + parent = cur->parent; if (cur->type != XML_DTD_NODE) { if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) xmlDeregisterNodeDefaultValue(cur); - if ((cur->children != NULL) && - (cur->type != XML_ENTITY_REF_NODE)) - xmlFreeNodeList(cur->children); if (((cur->type == XML_ELEMENT_NODE) || (cur->type == XML_XINCLUDE_START) || (cur->type == XML_XINCLUDE_END)) && @@ -3720,7 +3727,16 @@ xmlFreeNodeList(xmlNodePtr cur) { DICT_FREE(cur->name) xmlFree(cur); } - cur = next; + + if (next != NULL) { + cur = next; + } else { + if ((depth == 0) || (parent == NULL)) + break; + depth -= 1; + cur = parent; + cur->children = NULL; + } } } @@ -4050,7 +4066,7 @@ xmlCopyPropInternal(xmlDocPtr doc, xmlNodePtr target, xmlAttrPtr cur) { } else { /* * we have to find something appropriate here since - * we cant be sure, that the namespce we found is identified + * we cant be sure, that the namespace we found is identified * by the prefix */ if (xmlStrEqual(ns->href, cur->ns->href)) { @@ -4058,10 +4074,10 @@ xmlCopyPropInternal(xmlDocPtr doc, xmlNodePtr target, xmlAttrPtr cur) { ret->ns = ns; } else { /* - * we are in trouble: we need a new reconcilied namespace. + * we are in trouble: we need a new reconciled namespace. * This is expensive */ - ret->ns = xmlNewReconciliedNs(target->doc, target, cur->ns); + ret->ns = xmlNewReconciledNs(target->doc, target, cur->ns); } } @@ -4154,8 +4170,8 @@ xmlCopyPropList(xmlNodePtr target, xmlAttrPtr cur) { * say RPM:Copyright without changing the namespace pointer to * something else can produce stale links. One way to do it is * to keep a reference counter but this doesn't work as soon - * as one move the element or the subtree out of the scope of - * the existing namespace. The actual solution seems to add + * as one moves the element or the subtree out of the scope of + * the existing namespace. The actual solution seems to be to add * a copy of the namespace at the top of the copied tree if * not available in the subtree. * Hence two functions, the public front-end call the inner ones @@ -4280,7 +4296,7 @@ xmlStaticCopyNode(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent, while (root->parent != NULL) root = root->parent; ret->ns = xmlNewNs(root, ns->href, ns->prefix); } else { - ret->ns = xmlNewReconciliedNs(doc, ret, node->ns); + ret->ns = xmlNewReconciledNs(doc, ret, node->ns); } } else { /* @@ -4719,7 +4735,7 @@ xmlGetNodePath(const xmlNode *node) /* * Thumbler index computation - * TODO: the ocurence test seems bogus for namespaced names + * TODO: the occurrence test seems bogus for namespaced names */ tmp = cur->prev; while (tmp != NULL) { @@ -6214,7 +6230,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href) } /** - * xmlNewReconciliedNs: + * xmlNewReconciledNs: * @doc: the document * @tree: a node expected to hold the new namespace * @ns: the original namespace @@ -6227,7 +6243,7 @@ xmlSearchNsByHref(xmlDocPtr doc, xmlNodePtr node, const xmlChar * href) * Returns the (new) namespace definition or NULL in case of error */ static xmlNsPtr -xmlNewReconciliedNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) { +xmlNewReconciledNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) { xmlNsPtr def; xmlChar prefix[50]; int counter = 1; @@ -6235,14 +6251,14 @@ xmlNewReconciliedNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) { if ((tree == NULL) || (tree->type != XML_ELEMENT_NODE)) { #ifdef DEBUG_TREE xmlGenericError(xmlGenericErrorContext, - "xmlNewReconciliedNs : tree == NULL\n"); + "xmlNewReconciledNs : tree == NULL\n"); #endif return(NULL); } if ((ns == NULL) || (ns->type != XML_NAMESPACE_DECL)) { #ifdef DEBUG_TREE xmlGenericError(xmlGenericErrorContext, - "xmlNewReconciliedNs : ns == NULL\n"); + "xmlNewReconciledNs : ns == NULL\n"); #endif return(NULL); } @@ -6344,7 +6360,7 @@ xmlReconciliateNs(xmlDocPtr doc, xmlNodePtr tree) { /* * OK we need to recreate a new namespace definition */ - n = xmlNewReconciliedNs(doc, tree, node->ns); + n = xmlNewReconciledNs(doc, tree, node->ns); if (n != NULL) { /* :-( what if else ??? */ /* * check if we need to grow the cache buffers. @@ -6373,7 +6389,7 @@ xmlReconciliateNs(xmlDocPtr doc, xmlNodePtr tree) { } } /* - * now check for namespace hold by attributes on the node. + * now check for namespace held by attributes on the node. */ if (node->type == XML_ELEMENT_NODE) { attr = node->properties; @@ -6408,7 +6424,7 @@ xmlReconciliateNs(xmlDocPtr doc, xmlNodePtr tree) { /* * OK we need to recreate a new namespace definition */ - n = xmlNewReconciliedNs(doc, tree, attr->ns); + n = xmlNewReconciledNs(doc, tree, attr->ns); if (n != NULL) { /* :-( what if else ??? */ /* * check if we need to grow the cache buffers. @@ -7961,7 +7977,7 @@ xmlDOMWrapNsMapAddItem(xmlNsMapPtr *nsmap, int position, * Creates or reuses an xmlNs struct on doc->oldNs with * the given prefix and namespace name. * -* Returns the aquired ns struct or NULL in case of an API +* Returns the acquired ns struct or NULL in case of an API * or internal error. */ static xmlNsPtr @@ -8575,7 +8591,7 @@ ns_next_prefix: } /* -* xmlDOMWrapNSNormAquireNormalizedNs: +* xmlDOMWrapNSNormAcquireNormalizedNs: * @doc: the doc * @elem: the element-node to declare namespaces on * @ns: the ns-struct to use for the search @@ -8594,7 +8610,7 @@ ns_next_prefix: * Returns 0 if succeeded, -1 otherwise and on API/internal errors. */ static int -xmlDOMWrapNSNormAquireNormalizedNs(xmlDocPtr doc, +xmlDOMWrapNSNormAcquireNormalizedNs(xmlDocPtr doc, xmlNodePtr elem, xmlNsPtr ns, xmlNsPtr *retNs, @@ -8893,9 +8909,9 @@ next_ns_decl: } } /* - * Aquire a normalized ns-decl and add it to the map. + * Acquire a normalized ns-decl and add it to the map. */ - if (xmlDOMWrapNSNormAquireNormalizedNs(doc, curElem, + if (xmlDOMWrapNSNormAcquireNormalizedNs(doc, curElem, cur->ns, &ns, &nsMap, depth, ancestorsOnly, @@ -9033,7 +9049,7 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt, nsMap = (xmlNsMapPtr) ctxt->namespaceMap; /* * Disable search for ns-decls in the parent-axis of the - * desination element, if: + * destination element, if: * 1) there's no destination parent * 2) custom ns-reference handling is used */ @@ -9178,9 +9194,9 @@ xmlDOMWrapAdoptBranch(xmlDOMWrapCtxtPtr ctxt, cur->ns = ns; } else { /* - * Aquire a normalized ns-decl and add it to the map. + * Acquire a normalized ns-decl and add it to the map. */ - if (xmlDOMWrapNSNormAquireNormalizedNs(destDoc, + if (xmlDOMWrapNSNormAcquireNormalizedNs(destDoc, /* ns-decls on curElem or on destDoc->oldNs */ destParent ? curElem : NULL, cur->ns, &ns, @@ -9234,7 +9250,7 @@ ns_end: goto leave_node; case XML_ENTITY_REF_NODE: /* - * Remove reference to the entitity-node. + * Remove reference to the entity-node. */ cur->content = NULL; cur->children = NULL; @@ -9468,7 +9484,7 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt, } memset(clone, 0, sizeof(xmlNode)); /* - * Set hierachical links. + * Set hierarchical links. */ if (resultClone != NULL) { clone->parent = parentClone; @@ -9492,7 +9508,7 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt, } memset(clone, 0, sizeof(xmlAttr)); /* - * Set hierachical links. + * Set hierarchical links. * TODO: Change this to add to the end of attributes. */ if (resultClone != NULL) { @@ -9720,9 +9736,9 @@ xmlDOMWrapCloneNode(xmlDOMWrapCtxtPtr ctxt, clone->ns = ns; } else { /* - * Aquire a normalized ns-decl and add it to the map. + * Acquire a normalized ns-decl and add it to the map. */ - if (xmlDOMWrapNSNormAquireNormalizedNs(destDoc, + if (xmlDOMWrapNSNormAcquireNormalizedNs(destDoc, /* ns-decls on curElem or on destDoc->oldNs */ destParent ? curElem : NULL, cur->ns, &ns, @@ -9959,7 +9975,7 @@ xmlDOMWrapAdoptAttr(xmlDOMWrapCtxtPtr ctxt, break; case XML_ENTITY_REF_NODE: /* - * Remove reference to the entitity-node. + * Remove reference to the entity-node. */ cur->content = NULL; cur->children = NULL; @@ -10097,7 +10113,7 @@ xmlDOMWrapAdoptNode(xmlDOMWrapCtxtPtr ctxt, break; case XML_ENTITY_REF_NODE: /* - * Remove reference to the entitity-node. + * Remove reference to the entity-node. */ node->content = NULL; node->children = NULL; diff --git a/sdk/lib/3rdparty/libxml2/trio.c b/sdk/lib/3rdparty/libxml2/trio.c index c8b9c84ebaa..f7a0da66013 100644 --- a/sdk/lib/3rdparty/libxml2/trio.c +++ b/sdk/lib/3rdparty/libxml2/trio.c @@ -2610,7 +2610,7 @@ TRIO_ARGS5((self, wstring, flags, width, precision), * * The accuracy [...] is implementation defined, as is the accuracy * of the conversion between floating-point internal representations - * and string representations performed by the libray routine in + * and string representations performed by the library routine in * <stdio.h>" */ /* FIXME: handle all instances of constant long-double number (L) @@ -5899,7 +5899,7 @@ TRIO_ARGS4((self, target, flags, width), } if (trio_equal(doubleString, NAN_UPPER)) { - /* NaN must not have a preceeding + nor - */ + /* NaN must not have a preceding + nor - */ if (flags & FLAGS_LONGDOUBLE) { *((trio_long_double_t *)target) = trio_nan(); diff --git a/sdk/lib/3rdparty/libxml2/trionan.c b/sdk/lib/3rdparty/libxml2/trionan.c index 71f1b1b9b37..f6358a3f97a 100644 --- a/sdk/lib/3rdparty/libxml2/trionan.c +++ b/sdk/lib/3rdparty/libxml2/trionan.c @@ -92,7 +92,7 @@ /* * In ANSI/IEEE 754-1985 64-bits double format numbers have the - * following properties (amoungst others) + * following properties (amongst others) * * o FLT_RADIX == 2: binary encoding * o DBL_MAX_EXP == 1024: 11 bits exponent, where one bit is used @@ -327,7 +327,7 @@ trio_nan(TRIO_NOARGS) if (result == 0.0) { -#if defined(TRIO_COMPILER_SUPPORTS_C99) && !defined(__clang__) +#if defined(TRIO_COMPILER_SUPPORTS_C99) && (!defined(__REACTOS__) || !defined(__clang__)) result = nan(""); #elif defined(NAN) && defined(__STDC_IEC_559__) diff --git a/sdk/lib/3rdparty/libxml2/uri.c b/sdk/lib/3rdparty/libxml2/uri.c index 2cf8d9f199b..05d81e57633 100644 --- a/sdk/lib/3rdparty/libxml2/uri.c +++ b/sdk/lib/3rdparty/libxml2/uri.c @@ -22,7 +22,7 @@ * MAX_URI_LENGTH: * * The definition of the URI regexp in the above RFC has no size limit - * In practice they are usually relativey short except for the + * In practice they are usually relatively short except for the * data URI scheme as defined in RFC 2397. Even for data URI the usual * maximum size before hitting random practical limits is around 64 KB * and 4KB is usually a maximum admitted limit for proper operations. @@ -325,16 +325,18 @@ static int xmlParse3986Port(xmlURIPtr uri, const char **str) { const char *cur = *str; - unsigned port = 0; /* unsigned for defined overflow behavior */ + int port = 0; if (ISA_DIGIT(cur)) { while (ISA_DIGIT(cur)) { port = port * 10 + (*cur - '0'); + if (port > 99999999) + port = 99999999; cur++; } if (uri != NULL) - uri->port = port & INT_MAX; /* port value modulo INT_MAX+1 */ + uri->port = port; *str = cur; return(0); } @@ -436,7 +438,7 @@ xmlParse3986Host(xmlURIPtr uri, const char **str) host = cur; /* - * IPv6 and future adressing scheme are enclosed between brackets + * IPv6 and future addressing scheme are enclosed between brackets */ if (*cur == '[') { cur++; @@ -1456,7 +1458,7 @@ xmlNormalizeURIPath(char *path) { goto done_cd; (out++)[0] = (cur++)[0]; } - /* nomalize // */ + /* normalize // */ while ((cur[0] == '/') && (cur[1] == '/')) cur++; @@ -2150,7 +2152,7 @@ done: * http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif * * - * Note: if the URI reference is really wierd or complicated, it may be + * Note: if the URI reference is really weird or complicated, it may be * worthwhile to first convert it into a "nice" one by calling * xmlBuildURI (using 'base') before calling this routine, * since this routine (for reasonable efficiency) assumes URI has @@ -2461,7 +2463,7 @@ path_processing: /* allocate space for leading '/' + path + string terminator */ uri->path = xmlMallocAtomic(len + 2); if (uri->path == NULL) { - xmlFreeURI(uri); /* Guard agains 'out of memory' */ + xmlFreeURI(uri); /* Guard against 'out of memory' */ return(NULL); } /* Put in leading '/' plus path */ @@ -2476,7 +2478,7 @@ path_processing: } p = uri->path; } - /* Now change all occurences of '\' to '/' */ + /* Now change all occurrences of '\' to '/' */ while (*p != '\0') { if (*p == '\\') *p = '/'; @@ -2526,7 +2528,7 @@ xmlPathToURI(const xmlChar *path) return(NULL); #if defined(_WIN32) && !defined(__CYGWIN__) /* xmlCanonicPath can return an URI on Windows (is that the intended behaviour?) - If 'cal' is a valid URI allready then we are done here, as continuing would make + If 'cal' is a valid URI already then we are done here, as continuing would make it invalid. */ if ((uri = xmlParseURI((const char *) cal)) != NULL) { xmlFreeURI(uri); diff --git a/sdk/lib/3rdparty/libxml2/valid.c b/sdk/lib/3rdparty/libxml2/valid.c index b1cfede2dbb..07963e74510 100644 --- a/sdk/lib/3rdparty/libxml2/valid.c +++ b/sdk/lib/3rdparty/libxml2/valid.c @@ -1099,14 +1099,22 @@ xmlCopyElementContent(xmlElementContentPtr cur) { */ void xmlFreeDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { - xmlElementContentPtr next; xmlDictPtr dict = NULL; + size_t depth = 0; + if (cur == NULL) + return; if (doc != NULL) dict = doc->dict; - while (cur != NULL) { - next = cur->c2; + while (1) { + xmlElementContentPtr parent; + + while ((cur->c1 != NULL) || (cur->c2 != NULL)) { + cur = (cur->c1 != NULL) ? cur->c1 : cur->c2; + depth += 1; + } + switch (cur->type) { case XML_ELEMENT_CONTENT_PCDATA: case XML_ELEMENT_CONTENT_ELEMENT: @@ -1119,7 +1127,6 @@ xmlFreeDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { NULL); return; } - if (cur->c1 != NULL) xmlFreeDocElementContent(doc, cur->c1); if (dict) { if ((cur->name != NULL) && (!xmlDictOwns(dict, cur->name))) xmlFree((xmlChar *) cur->name); @@ -1129,8 +1136,23 @@ xmlFreeDocElementContent(xmlDocPtr doc, xmlElementContentPtr cur) { if (cur->name != NULL) xmlFree((xmlChar *) cur->name); if (cur->prefix != NULL) xmlFree((xmlChar *) cur->prefix); } + parent = cur->parent; + if ((depth == 0) || (parent == NULL)) { + xmlFree(cur); + break; + } + if (cur == parent->c1) + parent->c1 = NULL; + else + parent->c2 = NULL; xmlFree(cur); - cur = next; + + if (parent->c2 != NULL) { + cur = parent->c2; + } else { + depth -= 1; + cur = parent; + } } } @@ -1148,83 +1170,104 @@ xmlFreeElementContent(xmlElementContentPtr cur) { #ifdef LIBXML_OUTPUT_ENABLED /** - * xmlDumpElementContent: + * xmlDumpElementOccur: * @buf: An XML buffer - * @content: An element table - * @glob: 1 if one must print the englobing parenthesis, 0 otherwise + * @cur: An element table * - * This will dump the content of the element table as an XML DTD definition + * Dump the occurence operator of an element. */ static void -xmlDumpElementContent(xmlBufferPtr buf, xmlElementContentPtr content, int glob) { - if (content == NULL) return; - - if (glob) xmlBufferWriteChar(buf, "("); - switch (content->type) { - case XML_ELEMENT_CONTENT_PCDATA: - xmlBufferWriteChar(buf, "#PCDATA"); - break; - case XML_ELEMENT_CONTENT_ELEMENT: - if (content->prefix != NULL) { - xmlBufferWriteCHAR(buf, content->prefix); - xmlBufferWriteChar(buf, ":"); - } - xmlBufferWriteCHAR(buf, content->name); - break; - case XML_ELEMENT_CONTENT_SEQ: - if ((content->c1 != NULL) && - ((content->c1->type == XML_ELEMENT_CONTENT_OR) || - (content->c1->type == XML_ELEMENT_CONTENT_SEQ))) - xmlDumpElementContent(buf, content->c1, 1); - else - xmlDumpElementContent(buf, content->c1, 0); - xmlBufferWriteChar(buf, " , "); - if ((content->c2 != NULL) && - ((content->c2->type == XML_ELEMENT_CONTENT_OR) || - ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) && - (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))) - xmlDumpElementContent(buf, content->c2, 1); - else - xmlDumpElementContent(buf, content->c2, 0); - break; - case XML_ELEMENT_CONTENT_OR: - if ((content->c1 != NULL) && - ((content->c1->type == XML_ELEMENT_CONTENT_OR) || - (content->c1->type == XML_ELEMENT_CONTENT_SEQ))) - xmlDumpElementContent(buf, content->c1, 1); - else - xmlDumpElementContent(buf, content->c1, 0); - xmlBufferWriteChar(buf, " | "); - if ((content->c2 != NULL) && - ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) || - ((content->c2->type == XML_ELEMENT_CONTENT_OR) && - (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))) - xmlDumpElementContent(buf, content->c2, 1); - else - xmlDumpElementContent(buf, content->c2, 0); - break; - default: - xmlErrValid(NULL, XML_ERR_INTERNAL_ERROR, - "Internal: ELEMENT content corrupted invalid type\n", - NULL); - } - if (glob) - xmlBufferWriteChar(buf, ")"); - switch (content->ocur) { +xmlDumpElementOccur(xmlBufferPtr buf, xmlElementContentPtr cur) { + switch (cur->ocur) { case XML_ELEMENT_CONTENT_ONCE: - break; + break; case XML_ELEMENT_CONTENT_OPT: - xmlBufferWriteChar(buf, "?"); - break; + xmlBufferWriteChar(buf, "?"); + break; case XML_ELEMENT_CONTENT_MULT: - xmlBufferWriteChar(buf, "*"); - break; + xmlBufferWriteChar(buf, "*"); + break; case XML_ELEMENT_CONTENT_PLUS: - xmlBufferWriteChar(buf, "+"); - break; + xmlBufferWriteChar(buf, "+"); + break; } } +/** + * xmlDumpElementContent: + * @buf: An XML buffer + * @content: An element table + * + * This will dump the content of the element table as an XML DTD definition + */ +static void +xmlDumpElementContent(xmlBufferPtr buf, xmlElementContentPtr content) { + xmlElementContentPtr cur; + + if (content == NULL) return; + + xmlBufferWriteChar(buf, "("); + cur = content; + + do { + if (cur == NULL) return; + + switch (cur->type) { + case XML_ELEMENT_CONTENT_PCDATA: + xmlBufferWriteChar(buf, "#PCDATA"); + break; + case XML_ELEMENT_CONTENT_ELEMENT: + if (cur->prefix != NULL) { + xmlBufferWriteCHAR(buf, cur->prefix); + xmlBufferWriteChar(buf, ":"); + } + xmlBufferWriteCHAR(buf, cur->name); + break; + case XML_ELEMENT_CONTENT_SEQ: + case XML_ELEMENT_CONTENT_OR: + if ((cur != content) && + (cur->parent != NULL) && + ((cur->type != cur->parent->type) || + (cur->ocur != XML_ELEMENT_CONTENT_ONCE))) + xmlBufferWriteChar(buf, "("); + cur = cur->c1; + continue; + default: + xmlErrValid(NULL, XML_ERR_INTERNAL_ERROR, + "Internal: ELEMENT cur corrupted invalid type\n", + NULL); + } + + while (cur != content) { + xmlElementContentPtr parent = cur->parent; + + if (parent == NULL) return; + + if (((cur->type == XML_ELEMENT_CONTENT_OR) || + (cur->type == XML_ELEMENT_CONTENT_SEQ)) && + ((cur->type != parent->type) || + (cur->ocur != XML_ELEMENT_CONTENT_ONCE))) + xmlBufferWriteChar(buf, ")"); + xmlDumpElementOccur(buf, cur); + + if (cur == parent->c1) { + if (parent->type == XML_ELEMENT_CONTENT_SEQ) + xmlBufferWriteChar(buf, " , "); + else if (parent->type == XML_ELEMENT_CONTENT_OR) + xmlBufferWriteChar(buf, " | "); + + cur = parent->c2; + break; + } + + cur = parent; + } + } while (cur != content); + + xmlBufferWriteChar(buf, ")"); + xmlDumpElementOccur(buf, content); +} + /** * xmlSprintfElementContent: * @buf: an output buffer @@ -1703,7 +1746,7 @@ xmlDumpElementDecl(xmlBufferPtr buf, xmlElementPtr elem) { } xmlBufferWriteCHAR(buf, elem->name); xmlBufferWriteChar(buf, " "); - xmlDumpElementContent(buf, elem->content, 1); + xmlDumpElementContent(buf, elem->content); xmlBufferWriteChar(buf, ">\n"); break; case XML_ELEMENT_TYPE_ELEMENT: @@ -1714,7 +1757,7 @@ xmlDumpElementDecl(xmlBufferPtr buf, xmlElementPtr elem) { } xmlBufferWriteCHAR(buf, elem->name); xmlBufferWriteChar(buf, " "); - xmlDumpElementContent(buf, elem->content, 1); + xmlDumpElementContent(buf, elem->content); xmlBufferWriteChar(buf, ">\n"); break; default: @@ -2640,7 +2683,7 @@ xmlAddID(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, ret->doc = doc; if ((ctxt != NULL) && (ctxt->vstateNr != 0)) { /* - * Operating in streaming mode, attr is gonna disapear + * Operating in streaming mode, attr is gonna disappear */ if (doc->dict != NULL) ret->name = xmlDictLookup(doc->dict, attr->name, -1); @@ -2968,7 +3011,7 @@ xmlAddRef(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, ret->value = xmlStrdup(value); if ((ctxt != NULL) && (ctxt->vstateNr != 0)) { /* - * Operating in streaming mode, attr is gonna disapear + * Operating in streaming mode, attr is gonna disappear */ ret->name = xmlStrdup(attr->name); ret->attr = NULL; diff --git a/sdk/lib/3rdparty/libxml2/xinclude.c b/sdk/lib/3rdparty/libxml2/xinclude.c index 001e992f7c2..ba850fa538d 100644 --- a/sdk/lib/3rdparty/libxml2/xinclude.c +++ b/sdk/lib/3rdparty/libxml2/xinclude.c @@ -449,6 +449,10 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) { xmlCtxtUseOptions(pctxt, ctxt->parseFlags | XML_PARSE_DTDLOAD); + /* Don't read from stdin. */ + if ((URL != NULL) && (strcmp(URL, "-") == 0)) + URL = "./-"; + inputStream = xmlLoadExternalEntity(URL, NULL, pctxt); if (inputStream == NULL) { xmlFreeParserCtxt(pctxt); @@ -667,7 +671,7 @@ xmlXIncludeRecurseDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, int i; /* - * Avoid recursion in already substitued resources + * Avoid recursion in already substituted resources for (i = 0;i < ctxt->urlNr;i++) { if (xmlStrEqual(doc->URL, ctxt->urlTab[i])) return; @@ -752,7 +756,7 @@ xmlXIncludeRecurseDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc, * @txt: the new text node * @url: the associated URL * - * Add a new txtument to the list + * Add a new text node to the list */ static void xmlXIncludeAddTxt(xmlXIncludeCtxtPtr ctxt, xmlNodePtr txt, const xmlURL url) { @@ -1258,7 +1262,7 @@ struct _xmlXIncludeMergeData { * @doc: the including doc * @nr: the entity name * - * Inplements the merge of one entity + * Implements the merge of one entity */ static void xmlXIncludeMergeEntity(void *payload, void *vdata, @@ -1335,7 +1339,7 @@ error: * @doc: the including doc * @from: the included doc * - * Inplements the entity merge + * Implements the entity merge * * Returns 0 if merge succeeded, -1 if some processing failed */ @@ -1806,6 +1810,10 @@ xmlXIncludeLoadTxt(xmlXIncludeCtxtPtr ctxt, const xmlChar *url, int nr) { xmlParserInputPtr inputStream; int xinclude_multibyte_fallback_used = 0; + /* Don't read from stdin. */ + if (xmlStrcmp(url, BAD_CAST "-") == 0) + url = BAD_CAST "./-"; + /* * Check the URL and remove any fragment identifier */ @@ -1914,7 +1922,7 @@ xinclude_multibyte_fallback: cur = xmlStringCurrentChar(NULL, &content[i], &l); if (!IS_CHAR(cur)) { - /* Handle splitted multibyte char at buffer boundary */ + /* Handle split multibyte char at buffer boundary */ if (((len - i) < 4) && (!xinclude_multibyte_fallback_used)) { xinclude_multibyte_fallback_used = 1; xmlBufShrink(buf->buffer, i); @@ -1923,6 +1931,7 @@ xinclude_multibyte_fallback: xmlXIncludeErr(ctxt, ctxt->incTab[nr]->ref, XML_XINCLUDE_INVALID_CHAR, "%s contains invalid char\n", URL); + xmlFreeParserCtxt(pctxt); xmlFreeParserInputBuffer(buf); xmlFree(URL); return(-1); @@ -1963,6 +1972,7 @@ static int xmlXIncludeLoadFallback(xmlXIncludeCtxtPtr ctxt, xmlNodePtr fallback, int nr) { xmlXIncludeCtxtPtr newctxt; int ret = 0; + int oldNbErrors = ctxt->nbErrors; if ((fallback == NULL) || (fallback->type == XML_NAMESPACE_DECL) || (ctxt == NULL)) @@ -1979,7 +1989,7 @@ xmlXIncludeLoadFallback(xmlXIncludeCtxtPtr ctxt, xmlNodePtr fallback, int nr) { newctxt->base = xmlStrdup(ctxt->base); /* Inherit the base from the existing context */ xmlXIncludeSetFlags(newctxt, ctxt->parseFlags); ret = xmlXIncludeDoProcess(newctxt, ctxt->doc, fallback->children); - if (ctxt->nbErrors > 0) + if (ctxt->nbErrors > oldNbErrors) ret = -1; else if (ret > 0) ret = 0; /* xmlXIncludeDoProcess can return +ve number */ @@ -2133,7 +2143,7 @@ xmlXIncludeLoadNode(xmlXIncludeCtxtPtr ctxt, int nr) { xmlNodePtr children; /* - * Time to try a fallback if availble + * Time to try a fallback if available */ #ifdef DEBUG_XINCLUDE xmlGenericError(xmlGenericErrorContext, "error looking for fallback\n"); @@ -2178,7 +2188,7 @@ xmlXIncludeLoadNode(xmlXIncludeCtxtPtr ctxt, int nr) { * @ctxt: an XInclude context * @nr: the node number * - * Inplement the infoset replacement for the given node + * Implement the infoset replacement for the given node * * Returns 0 if substitution succeeded, -1 if some processing failed */ diff --git a/sdk/lib/3rdparty/libxml2/xmlIO.c b/sdk/lib/3rdparty/libxml2/xmlIO.c index 66a23432b9e..9972e5664a5 100644 --- a/sdk/lib/3rdparty/libxml2/xmlIO.c +++ b/sdk/lib/3rdparty/libxml2/xmlIO.c @@ -189,9 +189,9 @@ static const char *IOerr[] = { "already connected", /* EISCONN */ "connection refused", /* ECONNREFUSED */ "unreachable network", /* ENETUNREACH */ - "adddress in use", /* EADDRINUSE */ + "address in use", /* EADDRINUSE */ "already in use", /* EALREADY */ - "unknown address familly", /* EAFNOSUPPORT */ + "unknown address family", /* EAFNOSUPPORT */ }; #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) @@ -2387,6 +2387,7 @@ xmlAllocOutputBuffer(xmlCharEncodingHandlerPtr encoder) { if (encoder != NULL) { ret->conv = xmlBufCreateSize(4000); if (ret->conv == NULL) { + xmlBufFree(ret->buffer); xmlFree(ret); return(NULL); } @@ -2439,6 +2440,7 @@ xmlAllocOutputBufferInternal(xmlCharEncodingHandlerPtr encoder) { if (encoder != NULL) { ret->conv = xmlBufCreateSize(4000); if (ret->conv == NULL) { + xmlBufFree(ret->buffer); xmlFree(ret); return(NULL); } @@ -3339,7 +3341,7 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) { int nbchars = 0; /* number of chars to output to I/O */ int ret; /* return from function call */ int written = 0; /* number of char written to I/O so far */ - int chunk; /* number of byte curreent processed from buf */ + int chunk; /* number of byte current processed from buf */ if ((out == NULL) || (out->error)) return(-1); if (len < 0) return(0); @@ -3376,20 +3378,26 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) { out->error = XML_IO_ENCODER; return(-1); } - nbchars = xmlBufUse(out->conv); + if (out->writecallback) + nbchars = xmlBufUse(out->conv); + else + nbchars = ret; } else { ret = xmlBufAdd(out->buffer, (const xmlChar *) buf, chunk); if (ret != 0) return(-1); - nbchars = xmlBufUse(out->buffer); + if (out->writecallback) + nbchars = xmlBufUse(out->buffer); + else + nbchars = chunk; } buf += chunk; len -= chunk; - if ((nbchars < MINLEN) && (len <= 0)) - goto done; - if (out->writecallback) { + if ((nbchars < MINLEN) && (len <= 0)) + goto done; + /* * second write the stuff to the I/O channel */ @@ -3409,7 +3417,10 @@ xmlOutputBufferWrite(xmlOutputBufferPtr out, int len, const char *buf) { out->error = XML_IO_WRITE; return(ret); } - out->written += ret; + if (out->written > INT_MAX - ret) + out->written = INT_MAX; + else + out->written += ret; } written += nbchars; ... 4829 lines suppressed ...

1 0

[reactos] 01/01: [NTOS:IO] Fix parsing of resource lists
by Timo Kreuzer 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b82bf8ce167ae96dff286… commit b82bf8ce167ae96dff2868461e82136b90b8c45f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 28 23:44:28 2018 +0100 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 24 13:58:09 2020 +0300 [NTOS:IO] Fix parsing of resource lists Also add a hack to avoid failing on now occurring resource conflict detection and try to fix at least one resource in ACPI hal. CORE-10146 CORE-12892 --- drivers/bus/pci/CMakeLists.txt | 3 ++ drivers/bus/pci/pci.h | 1 + drivers/bus/pci/pdo.c | 7 ++-- drivers/bus/pcix/CMakeLists.txt | 4 +- drivers/bus/pcix/debug.c | 5 ++- drivers/bus/pcix/enum.c | 2 +- drivers/bus/pcix/pci.h | 15 +++----- drivers/bus/pcix/utils.c | 21 ----------- ntoskrnl/include/internal/cm.h | 1 + ntoskrnl/io/pnpmgr/pnpres.c | 60 +++++++++++++++++++++++++----- sdk/include/reactos/drivers/cmreslist.h | 66 +++++++++++++++++++++++++++++++++ win32ss/drivers/videoprt/resource.c | 9 ++++- 12 files changed, 146 insertions(+), 48 deletions(-) diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt index 5bd36b7bb7c..3e8fe17c8e6 100644 --- a/drivers/bus/pci/CMakeLists.txt +++ b/drivers/bus/pci/CMakeLists.txt @@ -1,4 +1,7 @@ +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) + list(APPEND SOURCE fdo.c pci.c diff --git a/drivers/bus/pci/pci.h b/drivers/bus/pci/pci.h index f3394c7ca44..3cd2204bf30 100644 --- a/drivers/bus/pci/pci.h +++ b/drivers/bus/pci/pci.h @@ -2,6 +2,7 @@ #define _PCI_PCH_ #include <ntifs.h> +#include <cmreslist.h> #define TAG_PCI '0ICP' diff --git a/drivers/bus/pci/pdo.c b/drivers/bus/pci/pdo.c index bedaac36fc0..1d6b8c54ecf 100644 --- a/drivers/bus/pci/pdo.c +++ b/drivers/bus/pci/pdo.c @@ -1335,12 +1335,13 @@ PdoStartDevice( /* TODO: Assign the other resources we get to the card */ - for (i = 0; i < RawResList->Count; i++) + RawFullDesc = &RawResList->List[0]; + for (i = 0; i < RawResList->Count; i++, RawFullDesc = CmiGetNextResourceDescriptor(RawFullDesc)) { - RawFullDesc = &RawResList->List[i]; - for (ii = 0; ii < RawFullDesc->PartialResourceList.Count; ii++) { + /* Partial resource descriptors can be of variable size (CmResourceTypeDeviceSpecific), + but only one is allowed and it must be the last one in the list! */ RawPartialDesc = &RawFullDesc->PartialResourceList.PartialDescriptors[ii]; if (RawPartialDesc->Type == CmResourceTypeInterrupt) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index 9389bde01eb..cdbcf5f8514 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -1,5 +1,7 @@ + include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/arbiter) + ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/arbiter + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE arb/ar_busno.c diff --git a/drivers/bus/pcix/debug.c b/drivers/bus/pcix/debug.c index 971cdadf498..4b7e0154f3c 100644 --- a/drivers/bus/pcix/debug.c +++ b/drivers/bus/pcix/debug.c @@ -386,12 +386,15 @@ PciDebugPrintCmResList(IN PCM_RESOURCE_LIST PartialList) Count = FullDescriptor->PartialResourceList.Count; for (PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors; Count; - PartialDescriptor = PciNextPartialDescriptor(PartialDescriptor)) + PartialDescriptor = CmiGetNextPartialDescriptor(PartialDescriptor)) { /* Print each partial */ PciDebugPrintPartialResource(PartialDescriptor); Count--; } + + /* Go to the next full descriptor */ + FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)PartialDescriptor; } /* Done printing data */ diff --git a/drivers/bus/pcix/enum.c b/drivers/bus/pcix/enum.c index edb8a261d97..fc3563d2c21 100644 --- a/drivers/bus/pcix/enum.c +++ b/drivers/bus/pcix/enum.c @@ -168,7 +168,7 @@ PciComputeNewCurrentSettings(IN PPCI_PDO_EXTENSION PdoExtension, } /* Move to the next descriptor */ - Partial = PciNextPartialDescriptor(Partial); + Partial = CmiGetNextPartialDescriptor(Partial); } /* We should be starting a new list now */ diff --git a/drivers/bus/pcix/pci.h b/drivers/bus/pcix/pci.h index fc6b578c24d..eb7f517d48b 100644 --- a/drivers/bus/pcix/pci.h +++ b/drivers/bus/pcix/pci.h @@ -19,6 +19,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/vffuncs.h> #include <arbiter.h> +#include <cmreslist.h> // // Tag used in all pool allocations (Pci Bus) @@ -1173,12 +1174,6 @@ PciQueryCapabilities( IN OUT PDEVICE_CAPABILITIES DeviceCapability ); -PCM_PARTIAL_RESOURCE_DESCRIPTOR -NTAPI -PciNextPartialDescriptor( - PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor -); - // // Configuration Routines // @@ -1787,10 +1782,10 @@ PciCacheLegacyDeviceRouting( IN PDEVICE_OBJECT DeviceObject, IN ULONG BusNumber, IN ULONG SlotNumber, - IN UCHAR InterruptLine, - IN UCHAR InterruptPin, - IN UCHAR BaseClass, - IN UCHAR SubClass, + IN UCHAR InterruptLine, + IN UCHAR InterruptPin, + IN UCHAR BaseClass, + IN UCHAR SubClass, IN PDEVICE_OBJECT PhysicalDeviceObject, IN PPCI_PDO_EXTENSION PdoExtension, OUT PDEVICE_OBJECT *pFoundDeviceObject diff --git a/drivers/bus/pcix/utils.c b/drivers/bus/pcix/utils.c index 32a03339e63..fe231559264 100644 --- a/drivers/bus/pcix/utils.c +++ b/drivers/bus/pcix/utils.c @@ -1764,25 +1764,4 @@ PciQueryCapabilities(IN PPCI_PDO_EXTENSION PdoExtension, return Status; } -PCM_PARTIAL_RESOURCE_DESCRIPTOR -NTAPI -PciNextPartialDescriptor(PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) -{ - PCM_PARTIAL_RESOURCE_DESCRIPTOR NextDescriptor; - - /* Assume the descriptors are the fixed size ones */ - NextDescriptor = CmDescriptor + 1; - - /* But check if this is actually a variable-sized descriptor */ - if (CmDescriptor->Type == CmResourceTypeDeviceSpecific) - { - /* Add the size of the variable section as well */ - NextDescriptor = (PVOID)((ULONG_PTR)NextDescriptor + - CmDescriptor->u.DeviceSpecificData.DataSize); - } - - /* Now the correct pointer has been computed, return it */ - return NextDescriptor; -} - /* EOF */ diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index a65e5e8ba2a..19f70265585 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -7,6 +7,7 @@ */ #define _CM_ #include "cmlib.h" +#include <cmreslist.h> // // Define this if you want debugging support diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c index 2711e1a1dac..b417072b087 100644 --- a/ntoskrnl/io/pnpmgr/pnpres.c +++ b/ntoskrnl/io/pnpmgr/pnpres.c @@ -12,6 +12,16 @@ #define NDEBUG #include <debug.h> +FORCEINLINE +PIO_RESOURCE_LIST +IopGetNextResourceList( + _In_ const IO_RESOURCE_LIST *ResourceList) +{ + ASSERT((ResourceList->Count > 0) && (ResourceList->Count < 1000)); + return (PIO_RESOURCE_LIST)( + &ResourceList->Descriptors[ResourceList->Count]); +} + static BOOLEAN IopCheckDescriptorForConflict( @@ -199,6 +209,9 @@ IopFindInterruptResource( } } + DPRINT1("Failed to satisfy interrupt requirement with IRQ 0x%x-0x%x\n", + IoDesc->u.Interrupt.MinimumVector, + IoDesc->u.Interrupt.MaximumVector); return FALSE; } @@ -209,6 +222,7 @@ IopFixupResourceListWithRequirements( { ULONG i, OldCount; BOOLEAN AlternateRequired = FALSE; + PIO_RESOURCE_LIST ResList; /* Save the initial resource count when we got here so we can restore if an alternate fails */ if (*ResourceList != NULL) @@ -216,10 +230,10 @@ IopFixupResourceListWithRequirements( else OldCount = 0; - for (i = 0; i < RequirementsList->AlternativeLists; i++) + ResList = &RequirementsList->List[0]; + for (i = 0; i < RequirementsList->AlternativeLists; i++, ResList = IopGetNextResourceList(ResList)) { ULONG ii; - PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; /* We need to get back to where we were before processing the last alternative list */ if (OldCount == 0 && *ResourceList != NULL) @@ -275,6 +289,8 @@ IopFixupResourceListWithRequirements( for (iii = 0; PartialList && iii < PartialList->Count && !Matched; iii++) { + /* Partial resource descriptors can be of variable size (CmResourceTypeDeviceSpecific), + but only one is allowed and it must be the last one in the list! */ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc = &PartialList->PartialDescriptors[iii]; /* First check types */ @@ -548,12 +564,18 @@ IopCheckResourceDescriptor( { ULONG i, ii; BOOLEAN Result = FALSE; + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + FullDescriptor = &ResourceList->List[0]; for (i = 0; i < ResourceList->Count; i++) { - PCM_PARTIAL_RESOURCE_LIST ResList = &ResourceList->List[i].PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST ResList = &FullDescriptor->PartialResourceList; + FullDescriptor = CmiGetNextResourceDescriptor(FullDescriptor); + for (ii = 0; ii < ResList->Count; ii++) { + /* Partial resource descriptors can be of variable size (CmResourceTypeDeviceSpecific), + but only one is allowed and it must be the last one in the list! */ PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc2 = &ResList->PartialDescriptors[ii]; /* We don't care about shared resources */ @@ -674,7 +696,9 @@ ByeBye: sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); } - return Result; + // Hacked, because after fixing resource list parsing + // we actually detect resource conflicts + return Silent ? Result : FALSE; // Result; } static @@ -937,6 +961,7 @@ IopTranslateDeviceResources( { PCM_PARTIAL_RESOURCE_LIST pPartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR DescriptorRaw, DescriptorTranslated; + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; ULONG i, j, ListSize; NTSTATUS Status; @@ -959,13 +984,23 @@ IopTranslateDeviceResources( } RtlCopyMemory(DeviceNode->ResourceListTranslated, DeviceNode->ResourceList, ListSize); + FullDescriptor = &DeviceNode->ResourceList->List[0]; for (i = 0; i < DeviceNode->ResourceList->Count; i++) { - pPartialResourceList = &DeviceNode->ResourceList->List[i].PartialResourceList; + pPartialResourceList = &FullDescriptor->PartialResourceList; + FullDescriptor = CmiGetNextResourceDescriptor(FullDescriptor); + for (j = 0; j < pPartialResourceList->Count; j++) { + /* Partial resource descriptors can be of variable size (CmResourceTypeDeviceSpecific), + but only one is allowed and it must be the last one in the list! */ DescriptorRaw = &pPartialResourceList->PartialDescriptors[j]; - DescriptorTranslated = &DeviceNode->ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j]; + + /* Calculate the location of the translated resource descriptor */ + DescriptorTranslated = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)( + (PUCHAR)DeviceNode->ResourceListTranslated + + ((PUCHAR)DescriptorRaw - (PUCHAR)DeviceNode->ResourceList)); + switch (DescriptorRaw->Type) { case CmResourceTypePort: @@ -996,14 +1031,15 @@ IopTranslateDeviceResources( } case CmResourceTypeInterrupt: { + KIRQL Irql; DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( DeviceNode->ResourceList->List[i].InterfaceType, DeviceNode->ResourceList->List[i].BusNumber, DescriptorRaw->u.Interrupt.Level, DescriptorRaw->u.Interrupt.Vector, - (PKIRQL)&DescriptorTranslated->u.Interrupt.Level, + &Irql, &DescriptorTranslated->u.Interrupt.Affinity); - + DescriptorTranslated->u.Interrupt.Level = Irql; if (!DescriptorTranslated->u.Interrupt.Vector) { Status = STATUS_UNSUCCESSFUL; @@ -1184,12 +1220,18 @@ IopCheckForResourceConflict( { ULONG i, ii; BOOLEAN Result = FALSE; + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + FullDescriptor = &ResourceList1->List[0]; for (i = 0; i < ResourceList1->Count; i++) { - PCM_PARTIAL_RESOURCE_LIST ResList = &ResourceList1->List[i].PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST ResList = &FullDescriptor->PartialResourceList; + FullDescriptor = CmiGetNextResourceDescriptor(FullDescriptor); + for (ii = 0; ii < ResList->Count; ii++) { + /* Partial resource descriptors can be of variable size (CmResourceTypeDeviceSpecific), + but only one is allowed and it must be the last one in the list! */ PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc = &ResList->PartialDescriptors[ii]; Result = IopCheckResourceDescriptor(ResDesc, diff --git a/sdk/include/reactos/drivers/cmreslist.h b/sdk/include/reactos/drivers/cmreslist.h new file mode 100644 index 00000000000..5b52b8b6656 --- /dev/null +++ b/sdk/include/reactos/drivers/cmreslist.h @@ -0,0 +1,66 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Helper functions to parse CM_RESOURCE_LISTs + * COPYRIGHT: Copyright 2020 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <wdm.h> + +// +// Resource list helpers +// + +/* Usage note: + * As there can be only one variable-sized CM_PARTIAL_RESOURCE_DESCRIPTOR in the list (and it must be the last one), + * a right looping through resources can look like this: + * + * PCM_FULL_RESOURCE_DESCRIPTOR FullDesc = &ResourceList->List[0]; + * for (ULONG i = 0; i < ResourceList->Count; i++, FullDesc = CmiGetNextResourceDescriptor(FullDesc)) + * { + * for (ULONG j = 0; j < FullDesc->PartialResourceList.Count; j++) + * { + * PartialDesc = &FullDesc->PartialResourceList.PartialDescriptors[j]; + * // work with PartialDesc + * } + * } + */ + +FORCEINLINE +PCM_PARTIAL_RESOURCE_DESCRIPTOR +CmiGetNextPartialDescriptor( + _In_ const CM_PARTIAL_RESOURCE_DESCRIPTOR *PartialDescriptor) +{ + const CM_PARTIAL_RESOURCE_DESCRIPTOR *NextDescriptor; + + /* Assume the descriptors are the fixed size ones */ + NextDescriptor = PartialDescriptor + 1; + + /* But check if this is actually a variable-sized descriptor */ + if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) + { + /* Add the size of the variable section as well */ + NextDescriptor = (PVOID)((ULONG_PTR)NextDescriptor + + PartialDescriptor->u.DeviceSpecificData.DataSize); + ASSERT(NextDescriptor >= PartialDescriptor + 1); + } + + /* Now the correct pointer has been computed, return it */ + return (PCM_PARTIAL_RESOURCE_DESCRIPTOR)NextDescriptor; +} + +FORCEINLINE +PCM_FULL_RESOURCE_DESCRIPTOR +CmiGetNextResourceDescriptor( + _In_ const CM_FULL_RESOURCE_DESCRIPTOR *ResourceDescriptor) +{ + const CM_PARTIAL_RESOURCE_DESCRIPTOR *LastPartialDescriptor; + + /* Calculate the location of the last partial descriptor, which can have a + variable size! */ + LastPartialDescriptor = &ResourceDescriptor->PartialResourceList.PartialDescriptors[ + ResourceDescriptor->PartialResourceList.Count - 1]; + + /* Next full resource descriptor follows the last partial descriptor */ + return (PCM_FULL_RESOURCE_DESCRIPTOR)CmiGetNextPartialDescriptor(LastPartialDescriptor); +} diff --git a/win32ss/drivers/videoprt/resource.c b/win32ss/drivers/videoprt/resource.c index 4a44392a0f3..f6ac53c6842 100644 --- a/win32ss/drivers/videoprt/resource.c +++ b/win32ss/drivers/videoprt/resource.c @@ -765,7 +765,7 @@ VideoPortGetAccessRanges( ERR_(VIDEOPRT, "Too many access ranges found\n"); return ERROR_NOT_ENOUGH_MEMORY; } - if (Descriptor->Type == CmResourceTypeMemory) + else if (Descriptor->Type == CmResourceTypeMemory) { INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n", Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length); @@ -804,6 +804,11 @@ VideoPortGetAccessRanges( else DeviceExtension->InterruptShared = FALSE; } + else + { + ASSERT(FALSE); + return ERROR_INVALID_PARAMETER; + } } return NO_ERROR; @@ -838,7 +843,7 @@ VideoPortVerifyAccessRanges( if (!ResourceList) { WARN_(VIDEOPRT, "ExAllocatePool() failed\n"); - return ERROR_INVALID_PARAMETER; + return ERROR_NOT_ENOUGH_MEMORY; } /* Fill resource list */

1 0

[reactos] 01/01: [GITIGNORE] Remove "build" folder, which discards some commited files
by Victor Perevertkin 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c42e1246d18dd86943cd4… commit c42e1246d18dd86943cd4a6c78c93edda029f3b8 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 24 12:44:05 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 24 12:44:05 2020 +0300 [GITIGNORE] Remove "build" folder, which discards some commited files --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index d48e4a67626..19e0dbc320d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,5 @@ modules/[Aa][Hh][Kk]_[Tt]ests .cproject .project .settings -build .vscode sdk/tools/winesync/winesync.cfg

1 0

[reactos] 01/01: [SDK][RTL][NTDLL_APITEST] Add RtlMultipleAllocateHeap and RtlMultipleFreeHeap (#2641)
by Katayama Hirofumi MZ 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=774ef4e80e8fe150f854c… commit 774ef4e80e8fe150f854cd9c009253c434096add Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 24 17:45:43 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 24 17:45:43 2020 +0900 [SDK][RTL][NTDLL_APITEST] Add RtlMultipleAllocateHeap and RtlMultipleFreeHeap (#2641) - Add RtlMultipleAllocateHeap and RtlMultipleFreeHeap functions (2k3+). - Add a testcase for two functions. CORE-12026 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/RtlMultipleAllocateHeap.c | 286 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + sdk/include/ndk/rtlfuncs.h | 13 +- sdk/lib/rtl/heap.c | 62 ++++- 5 files changed, 351 insertions(+), 13 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index d03b29806c9..ac1804728fc 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -61,6 +61,7 @@ list(APPEND SOURCE RtlImageRvaToVa.c RtlIsNameLegalDOS8Dot3.c RtlMemoryStream.c + RtlMultipleAllocateHeap.c RtlNtPathNameToDosPathName.c RtlpEnsureBufferSize.c RtlQueryTimeZoneInfo.c diff --git a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c new file mode 100644 index 00000000000..b2eb3132afa --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c @@ -0,0 +1,286 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for RtlMultipleAllocateHeap and RtlMultipleFreeHeap + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include "precomp.h" + +typedef ULONG (NTAPI *FN_RtlMultipleAllocateHeap)(IN PVOID, IN ULONG, IN SIZE_T, IN ULONG, OUT PVOID *); +typedef ULONG (NTAPI *FN_RtlMultipleFreeHeap)(IN PVOID, IN ULONG, IN ULONG, OUT PVOID *); + +static FN_RtlMultipleAllocateHeap g_alloc = NULL; +static FN_RtlMultipleFreeHeap g_free = NULL; + +#define TEST_ALLOC(ret_expected,err_expected,threw_excepted,HeapHandle,Flags,Size,Count,Array) \ + threw = 0; \ + SetLastError(-1); \ + _SEH2_TRY { \ + ret = g_alloc((HeapHandle), (Flags), (Size), (Count), (Array)); \ + err = GetLastError(); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + threw = _SEH2_GetExceptionCode(); \ + } \ + _SEH2_END \ + ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ + ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ + ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); + +#define TEST_ALLOC_NO_RET(err_expected,threw_excepted,HeapHandle,Flags,Size,Count,Array) \ + threw = 0; \ + SetLastError(-1); \ + _SEH2_TRY { \ + ret = g_alloc((HeapHandle), (Flags), (Size), (Count), (Array)); \ + err = GetLastError(); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + threw = _SEH2_GetExceptionCode(); \ + } \ + _SEH2_END \ + ok((err) == (err_expected), "err excepted %d, but %d", (err_expected), (err)); \ + ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); + +#define TEST_FREE(ret_expected,err_expected,threw_excepted,HeapHandle,Flags,Count,Array) \ + threw = 0; \ + SetLastError(-1); \ + _SEH2_TRY { \ + ret = g_free((HeapHandle), (Flags), (Count), (Array)); \ + err = GetLastError(); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + threw = _SEH2_GetExceptionCode(); \ + } \ + _SEH2_END \ + ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ + ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ + ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); + +#define ASSUME_ARRAY_ITEMS_ARE_NULL() \ + ok(Array[0] == NULL, "Array[0] is expected as NULL\n"); \ + ok(Array[1] == NULL, "Array[1] is expected as NULL\n"); \ + ok(Array[2] == NULL, "Array[2] is expected as NULL\n"); + +#define INT_EXPECTED(var,value) \ + ok((var) == (value), #var " expected %d, but %d\n", (value), (var)) + +static void +set_array(PVOID *array, PVOID p0, PVOID p1, PVOID p2) +{ + array[0] = p0; + array[1] = p1; + array[2] = p2; +} + +static void +MultiHeapAllocTest() +{ + INT ret, threw, err; + HANDLE HeapHandle = GetProcessHeap(); + PVOID Array[3] = {NULL, NULL, NULL}; + + // HeapHandle is non-NULL and array is NULL + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 0, 0, NULL); + TEST_ALLOC(0, -1, 0xC0000005, HeapHandle, 0, 0, 1, NULL); + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 1, 0, NULL); + TEST_ALLOC(0, -1, 0xC0000005, HeapHandle, 0, 1, 1, NULL); + + // Array is non-NULL and contents are NULL + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 0, 0, Array); + ASSUME_ARRAY_ITEMS_ARE_NULL(); + + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(1, -1, 0, HeapHandle, 0, 0, 1, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] == NULL, "Array[1] is expected as NULL\n"); + ok(Array[2] == NULL, "Array[2] is expected as NULL\n"); + + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 1, 0, Array); + ASSUME_ARRAY_ITEMS_ARE_NULL(); + + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(1, -1, 0, HeapHandle, 0, 1, 1, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] == NULL, "Array[1] is expected as NULL\n"); + ok(Array[2] == NULL, "Array[2] is expected as NULL\n"); + + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(2, -1, 0, HeapHandle, 0, 1, 2, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] != NULL, "Array[1] is expected as non-NULL\n"); + ok(Array[2] == NULL, "Array[2] is expected as NULL\n"); + + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC(3, -1, 0, HeapHandle, 0, 1, 3, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] != NULL, "Array[1] is expected as non-NULL\n"); + ok(Array[2] != NULL, "Array[2] is expected as non-NULL\n"); + + // Array is non-NULL and contents are invalid pointers + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 0, 0, Array); + ok(Array[0] == (PVOID)1, "Array[0] is expected as 1\n"); + ok(Array[1] == (PVOID)2, "Array[1] is expected as 2\n"); + ok(Array[2] == (PVOID)3, "Array[2] is expected as 3\n"); + + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(1, -1, 0, HeapHandle, 0, 0, 1, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] == (PVOID)2, "Array[1] is expected as 2\n"); + ok(Array[2] == (PVOID)3, "Array[2] is expected as 3\n"); + + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(0, -1, 0, HeapHandle, 0, 1, 0, Array); + ok(Array[0] == (PVOID)1, "Array[0] is expected as 1\n"); + ok(Array[1] == (PVOID)2, "Array[1] is expected as 2\n"); + ok(Array[2] == (PVOID)3, "Array[2] is expected as 3\n"); + + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(1, -1, 0, HeapHandle, 0, 1, 1, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] == (PVOID)2, "Array[1] is expected as non-NULL\n"); + ok(Array[2] == (PVOID)3, "Array[2] is expected as NULL\n"); + + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(2, -1, 0, HeapHandle, 0, 1, 2, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] != NULL, "Array[1] is expected as non-NULL\n"); + ok(Array[2] == (PVOID)3, "Array[2] is expected as 3\n"); + + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_ALLOC(3, -1, 0, HeapHandle, 0, 1, 3, Array); + ok(Array[0] != NULL, "Array[0] is expected as non-NULL\n"); + ok(Array[1] != NULL, "Array[1] is expected as non-NULL\n"); + ok(Array[2] != NULL, "Array[2] is expected as non-NULL\n"); + + // Array is non-NULL and too large to allocate + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC_NO_RET(ERROR_NOT_ENOUGH_MEMORY, 0, HeapHandle, 0, 0x5FFFFFFF, 3, Array); + ok(ret != 3, "excepted not allocated"); + set_array(Array, NULL, NULL, NULL); + TEST_ALLOC_NO_RET(ERROR_NOT_ENOUGH_MEMORY, 0xC0000017, HeapHandle, HEAP_GENERATE_EXCEPTIONS, 0x5FFFFFFF, 3, Array); + ok(ret != 3, "excepted not allocated"); +} + +static void +MultiHeapFreeTest() +{ + INT ret, threw, err; + HANDLE HeapHandle = GetProcessHeap(); + PVOID Array[3] = {NULL, NULL, NULL}; + + // HeapHandle is non-NULL and array is NULL + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, NULL); + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, NULL); + TEST_FREE(0, -1, 0xC0000005, HeapHandle, 0, 1, NULL); + TEST_FREE(0, -1, 0xC0000005, HeapHandle, 0, 2, NULL); + TEST_FREE(0, -1, 0xC0000005, HeapHandle, 0, 3, NULL); + + // Array is non-NULL and contents are NULL + set_array(Array, NULL, NULL, NULL); + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, Array); + set_array(Array, NULL, NULL, NULL); + TEST_FREE(1, -1, 0, HeapHandle, 0, 1, Array); + set_array(Array, NULL, NULL, NULL); + TEST_FREE(2, -1, 0, HeapHandle, 0, 2, Array); + set_array(Array, NULL, NULL, NULL); + TEST_FREE(3, -1, 0, HeapHandle, 0, 3, Array); + + // Array is non-NULL and contents are invalid pointers + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, Array); + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_FREE(0, ERROR_INVALID_PARAMETER, 0, HeapHandle, 0, 1, Array); + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_FREE(0, ERROR_INVALID_PARAMETER, 0, HeapHandle, 0, 2, Array); + set_array(Array, (PVOID)1, (PVOID)2, (PVOID)3); + TEST_FREE(0, ERROR_INVALID_PARAMETER, 0, HeapHandle, 0, 3, Array); + + // Array is non-NULL and contents are 1 valid pointer and 2 NULLs + set_array(Array, NULL, NULL, NULL); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, Array); + + set_array(Array, NULL, NULL, NULL); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, -1, 0, HeapHandle, 0, 1, Array); + + set_array(Array, NULL, NULL, NULL); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(2, -1, 0, HeapHandle, 0, 2, Array); + + set_array(Array, NULL, NULL, NULL); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(3, -1, 0, HeapHandle, 0, 3, Array); + + // Array is non-NULL and contents are 1 valid pointer and 2 invalids + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(0, -1, 0, HeapHandle, 0, 0, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, -1, 0, HeapHandle, 0, 1, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, ERROR_INVALID_PARAMETER, 0, HeapHandle, 0, 2, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, ERROR_INVALID_PARAMETER, 0, HeapHandle, 0, 3, Array); + + // Array is non-NULL and contents are 1 valid pointer and 2 invalids (generate exceptions) + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(0, -1, 0, HeapHandle, HEAP_GENERATE_EXCEPTIONS, 0, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, -1, 0, HeapHandle, HEAP_GENERATE_EXCEPTIONS, 1, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, ERROR_INVALID_PARAMETER, 0, HeapHandle, HEAP_GENERATE_EXCEPTIONS, 2, Array); + + set_array(Array, NULL, (PVOID)2, (PVOID)3); + ret = g_alloc(HeapHandle, 0, 1, 1, Array); + INT_EXPECTED(ret, 1); + TEST_FREE(1, ERROR_INVALID_PARAMETER, 0, HeapHandle, HEAP_GENERATE_EXCEPTIONS, 3, Array); + + // Array is non-NULL and contents are 3 valid pointers + set_array(Array, NULL, NULL, NULL); + ret = g_alloc(HeapHandle, 0, 3, 3, Array); + INT_EXPECTED(ret, 3); + TEST_FREE(3, -1, 0, HeapHandle, 0, 3, Array); +} + +START_TEST(RtlMultipleAllocateHeap) +{ + HINSTANCE ntdll = LoadLibraryA("ntdll"); + + g_alloc = (FN_RtlMultipleAllocateHeap)GetProcAddress(ntdll, "RtlMultipleAllocateHeap"); + g_free = (FN_RtlMultipleFreeHeap)GetProcAddress(ntdll, "RtlMultipleFreeHeap"); + + if (!g_alloc || !g_free) + { + skip("RtlMultipleAllocateHeap or RtlMultipleFreeHeap not found\n"); + } + else + { + MultiHeapAllocTest(); + MultiHeapFreeTest(); + } + + FreeLibrary(ntdll); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 7b3155314eb..95efbb0f6d8 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -60,6 +60,7 @@ extern void func_RtlHandle(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); +extern void func_RtlMultipleAllocateHeap(void); extern void func_RtlNtPathNameToDosPathName(void); extern void func_RtlpEnsureBufferSize(void); extern void func_RtlQueryTimeZoneInformation(void); @@ -129,6 +130,7 @@ const struct test winetest_testlist[] = { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 }, { "RtlMemoryStream", func_RtlMemoryStream }, + { "RtlMultipleAllocateHeap", func_RtlMultipleAllocateHeap }, { "RtlNtPathNameToDosPathName", func_RtlNtPathNameToDosPathName }, { "RtlpEnsureBufferSize", func_RtlpEnsureBufferSize }, { "RtlQueryTimeZoneInformation", func_RtlQueryTimeZoneInformation }, diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 1e386af2861..d8764771eb7 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -992,27 +992,26 @@ RtlLockHeap( _In_ HANDLE Heap ); -_Must_inspect_result_ NTSYSAPI -NTSTATUS +ULONG NTAPI -RtlMultipleAllocateHeap ( +RtlMultipleAllocateHeap( _In_ HANDLE HeapHandle, _In_ ULONG Flags, _In_ SIZE_T Size, _In_ ULONG Count, _Out_cap_(Count) _Deref_post_bytecap_(Size) PVOID * Array - ); +); NTSYSAPI -NTSTATUS +ULONG NTAPI -RtlMultipleFreeHeap ( +RtlMultipleFreeHeap( _In_ HANDLE HeapHandle, _In_ ULONG Flags, _In_ ULONG Count, _In_count_(Count) /* _Deref_ _Post_invalid_ */ PVOID * Array - ); +); NTSYSAPI NTSTATUS diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index ccdb7d1ef29..ad4f6a1513d 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -4,6 +4,7 @@ * FILE: lib/rtl/heap.c * PURPOSE: RTL Heap backend allocator * PROGRAMMERS: Copyright 2010 Aleksey Bragin + * Copyright 2020 Katayama Hirofumi MZ */ /* Useful references: @@ -3972,7 +3973,8 @@ RtlQueryHeapInformation(HANDLE HeapHandle, return STATUS_UNSUCCESSFUL; } -NTSTATUS +/* @implemented */ +ULONG NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN ULONG Flags, @@ -3980,19 +3982,67 @@ RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN ULONG Count, OUT PVOID *Array) { - UNIMPLEMENTED; - return 0; + ULONG Index; + EXCEPTION_RECORD ExceptionRecord; + + for (Index = 0; Index < Count; ++Index) + { + Array[Index] = RtlAllocateHeap(HeapHandle, Flags, Size); + if (Array[Index] == NULL) + { + /* ERROR_NOT_ENOUGH_MEMORY */ + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); + + if (Flags & HEAP_GENERATE_EXCEPTIONS) + { + ExceptionRecord.ExceptionCode = STATUS_NO_MEMORY; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 0; + ExceptionRecord.ExceptionFlags = 0; + + RtlRaiseException(&ExceptionRecord); + } + break; + } + } + + return Index; } -NTSTATUS +/* @implemented */ +ULONG NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, IN ULONG Flags, IN ULONG Count, OUT PVOID *Array) { - UNIMPLEMENTED; - return 0; + ULONG Index; + + for (Index = 0; Index < Count; ++Index) + { + if (Array[Index] == NULL) + continue; + + _SEH2_TRY + { + if (!RtlFreeHeap(HeapHandle, Flags, Array[Index])) + { + /* ERROR_INVALID_PARAMETER */ + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + break; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* ERROR_INVALID_PARAMETER */ + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + break; + } + _SEH2_END; + } + + return Index; } /*

1 0

[reactos] 01/01: [SHELL32] Fix for incorrect init of hide/show hidden files & folders
by Kyle Katarn 24 Apr '20

24 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb43d8a89a58781dff983… commit cb43d8a89a58781dff9831e10ceb554617d88eb8 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Apr 24 08:38:41 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 24 08:38:41 2020 +0200 [SHELL32] Fix for incorrect init of hide/show hidden files & folders --- boot/bootdata/hivedef.inf | 1 + boot/bootdata/hivesft.inf | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 9b9b0f0007a..a8651695214 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1895,6 +1895,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-10 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010003,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010003,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010003,0x00000001 +; "Hidden" to be changed to 2 if we later want to have "Hide hidden files by default" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 3417cf62381..9f2511d0e7c 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -317,7 +317,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","Type",0x00000000,"radio" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","CheckedValue",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","ValueName",0x00000000,"Hidden" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","DefaultValue",0x00010001,0x00000002 +; "DefaultValue" to be changed to 2 if we later want to have "Hide hidden files by default" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","DefaultValue",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","HKeyRoot",0x00010001,0x80000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\NOHIDDEN","HelpID",0x00000000,"shell.hlp#51104" @@ -327,7 +328,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","Type",0x00000000,"radio" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","CheckedValue",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","ValueName",0x00000000,"Hidden" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","DefaultValue",0x00010001,0x00000002 +; "DefaultValue" to be changed to 2 if we later want to have "Hide hidden files by default" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","DefaultValue",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","HKeyRoot",0x00010001,0x80000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\Hidden\SHOWALL","HelpID",0x00000000,"shell.hlp#51105"

1 0

[reactos] 01/01: [INTL] Fix build (#2612)
by Stanislav Motylkov 23 Apr '20

23 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56c060b8761cb219ab9eb… commit 56c060b8761cb219ab9eb6a9c39a4fc862e16f1b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Apr 24 02:48:22 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Apr 24 02:48:22 2020 +0300 [INTL] Fix build (#2612) Addendum to 76dd2fc. --- dll/cpl/intl/lang/id-ID.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/intl/lang/id-ID.rc b/dll/cpl/intl/lang/id-ID.rc index 02b28a8d006..300d42407a6 100644 --- a/dll/cpl/intl/lang/id-ID.rc +++ b/dll/cpl/intl/lang/id-ID.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[reactos] 02/02: [REACTOS] Remove some ending spaces
by Serge Gautherie 23 Apr '20

23 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=268b21f92e833a096d814… commit 268b21f92e833a096d814997c7059d1bae04a871 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Apr 18 16:40:42 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Apr 24 02:32:05 2020 +0300 [REACTOS] Remove some ending spaces --- CONTRIBUTING.md | 6 +++--- CREDITS | 6 +++--- INSTALL | 4 ++-- README.md | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 562785073a6..73ea943e487 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,8 +7,8 @@ There are several ways to contribute to the development of ReactOS. The most oft - [Where To Start?](#where-to-start?) **Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true: ->I hereby swear that I have not used nor seen the source code to any version of the Windows operating system ->nor any Microsoft product that may be related to the proposed project that is under a license incompatible +>I hereby swear that I have not used nor seen the source code to any version of the Windows operating system +>nor any Microsoft product that may be related to the proposed project that is under a license incompatible >with contribution to ReactOS, including but not limited to the leaked Windows 2000 source code and the Windows Research Kernel. ## What To Do? @@ -53,7 +53,7 @@ Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull reque ### Patches -A __[patch]__ is a set of changes to existing source code. The changes in a patch can be merged into existing source code. This process is referred to as applying a patch (to source code). Which changes a patch contains and the way the patch is structured can have significant impact on the consequences that can happen from applying the patch. +A __[patch]__ is a set of changes to existing source code. The changes in a patch can be merged into existing source code. This process is referred to as applying a patch (to source code). Which changes a patch contains and the way the patch is structured can have significant impact on the consequences that can happen from applying the patch. See [Submitting Patches] for details. diff --git a/CREDITS b/CREDITS index a5f36cb7e2d..f085df8cc22 100644 --- a/CREDITS +++ b/CREDITS @@ -44,11 +44,11 @@ Jason Eager Jason Filby <jasonfilby(a)yahoo.com> Jason Weiler Jean Michault -Jeffrey Morlan <mrnobo1024(a)yahoo.com> +Jeffrey Morlan <mrnobo1024(a)yahoo.com> Jerome Gardou <jerome.gardou(a)reactos.org> Jim Noeth Joachim Henze <joachim.henze(a)reactos.org> -Johannes Anderwald <johannes.anderwald(a)reactos.org> +Johannes Anderwald <johannes.anderwald(a)reactos.org> Jonathan Wilson <jonwil(a)tpgi.com.au> Jurgen van Gael <jurgen.vangael(a)student.kuleuven.ac.be> Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> @@ -93,6 +93,6 @@ Vizzini <vizzini(a)plasmic.com> Graphic Design from -Mindflyer <mf(a)mufunyo.net> +Mindflyer <mf(a)mufunyo.net> Tango Desktop Project <http://tango-project.org/> Everaldo <https://www.everaldo.com/> diff --git a/INSTALL b/INSTALL index 997812d640e..33b1710b5cf 100644 --- a/INSTALL +++ b/INSTALL @@ -88,8 +88,8 @@ contents. Then burn the CD image, boot from it, and follow instructions. ------- If you run into problems or have suggestions for making ReactOS better, please -visit the address below. Mailing lists are available for a variety of topics, -bugs should be submitted to JIRA and general chat takes place in the forums, +visit the address below. Mailing lists are available for a variety of topics, +bugs should be submitted to JIRA and general chat takes place in the forums, or #reactos on freenode. https://reactos.org/ diff --git a/README.md b/README.md index 5185d1fe77c..f093644398f 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ You can always download fresh binary builds of bootable images from the ["Daily ## Installing -By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. +By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if needed. @@ -102,10 +102,10 @@ You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely ## More information -ReactOS is a Free and Open Source operating system based on the Windows architecture, +ReactOS is a Free and Open Source operating system based on the Windows architecture, providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system. -It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past. +It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past. ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs