Fixed issue 1133 - part2

zdenop · zdenop · commit 5e754af9cbcf · 2015-05-01T19:12:03.000+02:00
diff --git a/training/pango_font_info.cpp b/training/pango_font_info.cpp
@@ -280,8 +280,9 @@ int PangoFontInfo::DropUncoveredChars(string* utf8_text) const {
       ++num_dropped_chars;
       continue;
     }
-    strncpy(out, it.utf8_data(), it.utf8_len());
-    out += it.utf8_len();
+    int it_utf8_len = it.utf8_len();
+    strncpy(out, it.utf8_data(), it_utf8_len);
+    out += it_utf8_len;
   }
   utf8_text->resize(out - utf8_text->c_str());
   return num_dropped_chars;

Original file line number	Diff line number	Diff line change
`@@ -280,8 +280,9 @@ int PangoFontInfo::DropUncoveredChars(string* utf8_text) const {`
`280`	`280`	`++num_dropped_chars;`
`281`	`281`	`continue;`
`282`	`282`	`}`
`283`		`- strncpy(out, it.utf8_data(), it.utf8_len());`
`284`		`- out += it.utf8_len();`
	`283`	`+ int it_utf8_len = it.utf8_len();`
	`284`	`+ strncpy(out, it.utf8_data(), it_utf8_len);`
	`285`	`+ out += it_utf8_len;`
`285`	`286`	`}`
`286`	`287`	`utf8_text->resize(out - utf8_text->c_str());`
`287`	`288`	`return num_dropped_chars;`