Skip to content

C
core
Kaydet (Commit) f3cbb539 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

icu#11131 coverity warnings 

Change-Id: I67d0b4b0c39c62646c7a0ae7152c7ca256680c38
üst 96dc1722
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 0 deletions
external/icu/UnpackedTarball_icu.mk
Dosyayı görüntüle @ f3cbb539
......@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu-ubsan.patch.0 \
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
))
# vim: set noet sw=4 ts=4:
external/icu/icu4c-icu11131.patch.1 0 → 100644
Dosyayı görüntüle @ f3cbb539
--- icu/source/i18n/smpdtfmt.cpp.orig 2014-08-27 10:29:29.849821672 +0530
+++ icu/source/i18n/smpdtfmt.cpp 2014-08-27 10:29:49.323821401 +0530
@@ -1082,6 +1082,7 @@
}
} else {
status = U_MEMORY_ALLOCATION_ERROR;
+ return;
}
}
umtx_unlock(&LOCK);
--- icu/source/common/usprep.cpp.orig 2014-08-27 10:38:24.360821077 +0530
+++ icu/source/common/usprep.cpp 2014-08-27 10:38:38.696821312 +0530
@@ -796,16 +796,23 @@ usprep_prepare( const UStringPrepProfi
}
CLEANUP:
- if(b1!=b1Stack){
- uprv_free(b1);
- b1=NULL;
- }
-
- if(b2!=b1Stack && b2!=b2Stack && b2!=b1 /* b1 should not be freed twice */){
- uprv_free(b2);
- b2=NULL;
- }
- return u_terminateUChars(dest, destCapacity, b2Len, status);
+ if(b2==b1 && b1!=b1Stack){
+ uprv_free(b1);
+ b1=NULL;
+ b2=NULL;
+ }
+ else
+ {
+ if(b1!=b1Stack){
+ uprv_free(b1);
+ b1=NULL;
+ }
+ if(b2!=b1Stack && b2!=b2Stack && b2!=b1 /* b1 should not be freed twice */){
+ uprv_free(b2);
+ b2=NULL;
+ }
+ }
+ return u_terminateUChars(dest, destCapacity, b2Len, status);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment