THRIFT-3354 Fix word-extraction substr bug in initialism code
Client: Go
Author: Prashant Varanasi <prashant@uber.com>
This closes #625
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index 806614f..f04bc48 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -446,7 +446,11 @@
// and if so replaces it with the upper case version of the word.
void t_go_generator::fix_common_initialism(std::string& value, int i) const {
if (!ignore_initialisms_) {
- std::string word = value.substr(i, value.find('_', i));
+ size_t wordLen = value.find('_', i);
+ if (wordLen != std::string::npos) {
+ wordLen -= i;
+ }
+ std::string word = value.substr(i, wordLen);
std::transform(word.begin(), word.end(), word.begin(), ::toupper);
if (commonInitialisms.find(word) != commonInitialisms.end()) {
value.replace(i, word.length(), word);