Djam/icu
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/icu.git synced 2025-02-23 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Security fix CVE-2013-2924, CVE-2013-0900

Browse source
This commit is contained in:
Danila Leontiev 2013-10-30 08:30:43 +04:00
parent 7dd2f7fd32
commit 49748db0ae
3 changed files with 1111 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
icu-CVE-2013-2924.patch Normal file
View file

@ -0,0 +1,29 @@
Index: /icu/trunk/source/i18n/csrucode.cpp
===================================================================
--- /icu/trunk/source/i18n/csrucode.cpp (revision 34075)
+++ /icu/trunk/source/i18n/csrucode.cpp (revision 34076)
@@ -34,6 +34,7 @@
{
const uint8_t *input = textIn->fRawInput;
+ int32_t length = textIn->fRawLength;
- if (input[0] == 0xFE && input[1] == 0xFF) {
+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
return 100;
}
@@ -58,6 +59,7 @@
{
const uint8_t *input = textIn->fRawInput;
+ int32_t length = textIn->fRawLength;
- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
+ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
return 100;
}
@@ -82,5 +84,5 @@
int32_t confidence = 0;
- if (getChar(input, 0) == 0x0000FEFFUL) {
+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
hasBOM = TRUE;
}

1078
icu.9737.CVE-2013-0900_changesets_32865_32908.patch Normal file
View file

File diff suppressed because it is too large Load diff

4
icu.spec
View file

@ -17,6 +17,8 @@ Source1: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarb
Patch0: %{name}4c-3_8-setBreakType.patch
Patch6: icu-4.6.1-do-not-promote-ldflags.patch
Patch7: icu4c-4_8-CVE-2011-4599.diff
Patch8: icu.9737.CVE-2013-0900_changesets_32865_32908.patch
Patch9: icu-CVE-2013-2924.patch
BuildRequires: doxygen
Requires: %{libname} = %{epoch}:%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@ -80,6 +82,8 @@ Development files and headers for the International Components for Unicode.
%patch0 -p1 -b .setBreakType
%patch6 -p0 -b .ldflags
%patch7 -p0 -b .CVE-2011-4599
%patch8 -p1
%patch9 -p3
mkdir -p docs
cd docs