summaryrefslogtreecommitdiff
path: root/ext/intl
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-10-20 22:04:21 -0700
committerStanislav Malyshev <stas@php.net>2013-10-20 22:04:21 -0700
commitdab1d76e9def81acd51d2ea9ed55c74af1a093ed (patch)
tree243728bb23af9855f9b91eda68b228935d84faa3 /ext/intl
parent9aad9114e3566780c3c7a383acd983b7b861a3f4 (diff)
downloadphp-git-dab1d76e9def81acd51d2ea9ed55c74af1a093ed.tar.gz
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
Diffstat (limited to 'ext/intl')
-rw-r--r--ext/intl/locale/locale_methods.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 1707c69f93..9c5b09a7bc 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -127,6 +127,9 @@ static char* getPreferredTag(char* gf_tag)
int grOffset = 0;
grOffset = findOffset( LOC_GRANDFATHERED ,gf_tag);
+ if(grOffset < 0) {
+ return NULL;
+ }
if( grOffset < LOC_PREFERRED_GRANDFATHERED_LEN ){
/* return preferred tag */
result = estrdup( LOC_PREFERRED_GRANDFATHERED[grOffset] );