diff --git a/desmume/src/Database.cpp b/desmume/src/Database.cpp index 1a0d3ca43..519c9985d 100644 --- a/desmume/src/Database.cpp +++ b/desmume/src/Database.cpp @@ -374,7 +374,7 @@ namespace Database size_t regions_num = ARRAY_SIZE(regions); const char* found = strchr(regions_index,code); - if(found) return regions[found-regions_index]; + if(found && found-regions_index < strlen(regions_index)) return regions[found-regions_index]; else return unknownAsString ? "???" : NULL; }