Merge "Snap for 4726689 from b216e0eab7537138fdef5fcb9e4b17c45e82737e to oreo-mr1-cts-release" into oreo-mr1-cts-releaseandroid-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10oreo-mr1-cts-release

1 files changed, 8 insertions, 1 deletions

diff --git a/pico/tts/svox_ssml_parser.cpp b/pico/tts/svox_ssml_parser.cpp
index 1e86940..94cd25a 100755
--- a/pico/tts/svox_ssml_parser.cpp
+++ b/pico/tts/svox_ssml_parser.cpp
@@ -57,7 +57,12 @@ SvoxSsmlParser::SvoxSsmlParser() : m_isInBreak(0), m_appendix(NULL), m_docLangua
         XML_SetUserData(mParser, (void*)this);
         m_datasize = 512;
         m_data = new char[m_datasize];
-        m_data[0] = '\0';
+        if (!m_data)
+        {
+            ALOGE("Error: failed to allocate memory for string!\n");
+        } else {
+            memset(m_data, 0, m_datasize);
+        }
     }
 }
 
@@ -120,6 +125,8 @@ void SvoxSsmlParser::startElement(const XML_Char* element, const XML_Char** attr
             {
                 ALOGE("Error: failed to allocate memory for string!\n");
                 return;
+            } else {
+                memset(m_data, 0, m_datasize);
             }
         }