[Bug 16929] Copied strings are now null-terminated

livecodepanos · livecodepanos · commit e68bcfa7ace3 · 2016-02-15T15:31:58.000Z
diff --git a/revspeech/src/osxspeech.cpp b/revspeech/src/osxspeech.cpp
@@ -136,6 +136,8 @@ bool OSXSpeechNarrator::ListVoices(NarratorGender p_gender, NarratorListVoicesCa
             if ((t_gender != -1) && (myInfo.gender != t_gender)) continue;
             char cvoice[256];
             strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);
+			// PM-2016-02-15: [[ Bug 16929 ]] Make sure the copied strings are null-terminated
+			cvoice[myInfo.name[0]]='\0';
 			p_callback(p_context, p_gender, cvoice);
 		}
 	}
@@ -292,6 +294,8 @@ void OSXSpeechNarrator::FindAndSelect()
                 VoiceDescription myInfo;
                 if (GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr) {
                     strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);
+					// PM-2016-02-15: [[ Bug 16929 ]] Make sure the copied strings are null-terminated
+					cvoice[myInfo.name[0]]='\0';
                     if (strcmp(cvoice,speechvoice) == 0)
                     {
                         FoundVoice = &tVoice;

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ bool OSXSpeechNarrator::ListVoices(NarratorGender p_gender, NarratorListVoicesCa`
`136`	`136`	`if ((t_gender != -1) && (myInfo.gender != t_gender)) continue;`
`137`	`137`	`char cvoice[256];`
`138`	`138`	`strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);`
	`139`	`+ // PM-2016-02-15: [[ Bug 16929 ]] Make sure the copied strings are null-terminated`
	`140`	`+ cvoice[myInfo.name[0]]='\0';`
`139`	`141`	`p_callback(p_context, p_gender, cvoice);`
`140`	`142`	`}`
`141`	`143`	`}`
`@@ -292,6 +294,8 @@ void OSXSpeechNarrator::FindAndSelect()`
`292`	`294`	`VoiceDescription myInfo;`
`293`	`295`	`if (GetVoiceDescription(&tVoice, &myInfo, sizeof(myInfo)) == noErr) {`
`294`	`296`	`strncpy(cvoice, (const char*)&myInfo.name[1], myInfo.name[0]);`
	`297`	`+ // PM-2016-02-15: [[ Bug 16929 ]] Make sure the copied strings are null-terminated`
	`298`	`+ cvoice[myInfo.name[0]]='\0';`
`295`	`299`	`if (strcmp(cvoice,speechvoice) == 0)`
`296`	`300`	`{`
`297`	`301`	`FoundVoice = &tVoice;`