Fix error handling in GetLocaleIso639LanguageTwoLetterName

filipnavara · filipnavara · commit 2913cdca6a70 · 2019-02-03T03:20:45.000+01:00
diff --git a/src/corefx/System.Globalization.Native/pal_localeStringData.c b/src/corefx/System.Globalization.Native/pal_localeStringData.c
@@ -72,12 +72,14 @@ UErrorCode GetLocaleIso639LanguageTwoLetterName(const char* locale, UChar* value
     UErrorCode status = U_ZERO_ERROR;
     int32_t length = uloc_getLanguage(locale, NULL, 0, &status) + 1;
 
+    assert(status == U_BUFFER_OVERFLOW_ERROR);
     char* buf = calloc(length, sizeof(char));
     if (buf == NULL)
     {
         return U_MEMORY_ALLOCATION_ERROR;
     }
 
+    status = U_ZERO_ERROR;
     uloc_getLanguage(locale, buf, length, &status);
 
     if (U_SUCCESS(status))

Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,14 @@ UErrorCode GetLocaleIso639LanguageTwoLetterName(const char* locale, UChar* value`
`72`	`72`	`UErrorCode status = U_ZERO_ERROR;`
`73`	`73`	`int32_t length = uloc_getLanguage(locale, NULL, 0, &status) + 1;`
`74`	`74`
	`75`	`+ assert(status == U_BUFFER_OVERFLOW_ERROR);`
`75`	`76`	`char* buf = calloc(length, sizeof(char));`
`76`	`77`	`if (buf == NULL)`
`77`	`78`	`{`
`78`	`79`	`return U_MEMORY_ALLOCATION_ERROR;`
`79`	`80`	`}`
`80`	`81`
	`82`	`+ status = U_ZERO_ERROR;`
`81`	`83`	`uloc_getLanguage(locale, buf, length, &status);`
`82`	`84`
`83`	`85`	`if (U_SUCCESS(status))`