Skip to content

Commit f2cd058

Browse files
committed
[voice_text] fix double freeing and return value
1 parent 71ade70 commit f2cd058

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

3rdparty/voice_text/src/vt_handler.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,7 @@ VTHandler::VTHandler(const std::string license_path, const std::string db_path,
137137
// Load engine
138138
if (enable_custom_engine_info){
139139
ROS_INFO("[ReadSpeaker API] Add new custom engine");
140-
char *speaker_char_, *type_char_, *lang_char_, *gender_char_, *iso_code_char_, *vendor_char_;
141-
speaker_char_ = (char*)calloc(std::strlen(speaker.c_str())+1, sizeof(char));
142-
std::strcpy(speaker_char_, speaker.c_str());
143-
type_char_ = (char*)calloc(std::strlen(type.c_str())+1, sizeof(char));
144-
std::strcpy(type_char_, type.c_str());
140+
char *lang_char_, *gender_char_, *iso_code_char_, *vendor_char_;
145141
lang_char_ = (char*)calloc(std::strlen(lang.c_str())+1, sizeof(char));
146142
std::strcpy(lang_char_, lang.c_str());
147143
gender_char_ = (char*)calloc(std::strlen(gender.c_str())+1, sizeof(char));
@@ -160,8 +156,6 @@ VTHandler::VTHandler(const std::string license_path, const std::string db_path,
160156
iso_code_char_,
161157
vendor_char_,
162158
sampling_rate);
163-
free(speaker_char_);
164-
free(type_char_);
165159
free(lang_char_);
166160
free(gender_char_);
167161
free(iso_code_char_);
@@ -291,7 +285,6 @@ bool VTHandler::VTH_TextToFile(const int pitch, const int speed, const int volum
291285

292286
free(text_char_);
293287
free(wave_path_char_);
294-
295-
return success_;
296288
}
289+
return success_;
297290
}

0 commit comments

Comments
 (0)