Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: source/i18n/rbt_pars.cpp

Issue 1366563006: CFI: fix a bad cast from icu_54::Quantifier to icu_54::UnicodeSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ********************************************************************** 2 **********************************************************************
3 * Copyright (C) 1999-2011, International Business Machines 3 * Copyright (C) 1999-2011, International Business Machines
4 * Corporation and others. All Rights Reserved. 4 * Corporation and others. All Rights Reserved.
5 ********************************************************************** 5 **********************************************************************
6 * Date Name Description 6 * Date Name Description
7 * 11/17/99 aliu Creation. 7 * 11/17/99 aliu Creation.
8 ********************************************************************** 8 **********************************************************************
9 */ 9 */
10 10
(...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 // NULL pointer check 1095 // NULL pointer check
1096 if (data->variables == NULL) { 1096 if (data->variables == NULL) {
1097 status = U_MEMORY_ALLOCATION_ERROR; 1097 status = U_MEMORY_ALLOCATION_ERROR;
1098 return; 1098 return;
1099 } 1099 }
1100 data->variablesAreOwned = (i == 0); 1100 data->variablesAreOwned = (i == 0);
1101 } 1101 }
1102 1102
1103 for (int32_t j = 0; j < data->variablesLength; j++) { 1103 for (int32_t j = 0; j < data->variablesLength; j++) {
1104 data->variables[j] = 1104 data->variables[j] =
1105 ((UnicodeSet*)variablesVector.elementAt(j)); 1105 ((UnicodeFunctor*)variablesVector.elementAt(j));
1106 } 1106 }
1107 1107
1108 data->variableNames.removeAll(); 1108 data->variableNames.removeAll();
1109 int32_t pos = -1; 1109 int32_t pos = -1;
1110 const UHashElement* he = variableNames.nextElement(pos); 1110 const UHashElement* he = variableNames.nextElement(pos);
1111 while (he != NULL) { 1111 while (he != NULL) {
1112 UnicodeString* tempus = (UnicodeString*)(((UnicodeString*)(he->v alue.pointer))->clone()); 1112 UnicodeString* tempus = (UnicodeString*)(((UnicodeString*)(he->v alue.pointer))->clone());
1113 if (tempus == NULL) { 1113 if (tempus == NULL) {
1114 status = U_MEMORY_ALLOCATION_ERROR; 1114 status = U_MEMORY_ALLOCATION_ERROR;
1115 return; 1115 return;
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1729 U16_APPEND_UNSAFE(target, index, c); 1729 U16_APPEND_UNSAFE(target, index, c);
1730 target+=index; 1730 target+=index;
1731 } 1731 }
1732 if (target < targetLimit) { 1732 if (target < targetLimit) {
1733 *target = 0; 1733 *target = 0;
1734 } 1734 }
1735 return (int32_t)(target-targetStart); 1735 return (int32_t)(target-targetStart);
1736 } 1736 }
1737 1737
1738 #endif /* #if !UCONFIG_NO_TRANSLITERATION */ 1738 #endif /* #if !UCONFIG_NO_TRANSLITERATION */
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698