archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T50305: When adding new ID with same name as existing, Blender could generate invalid utf-8 ID name.

Browse Source 
`check_for_dupid()` would roughly truncate existing name, without doing any utf-8 validation.
This commit is contained in:
Bastien Montagne
2017-01-01 02:27:03 +01:00
parent adadfaad88
commit 7924c84c44
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/library.c
View File

@@ -1431,14 +1431,18 @@ static bool check_for_dupid(ListBase *lb, ID *id, char *name)
/* if new name will be too long, truncate it */
if (nr > 999 && left_len > (MAX_ID_NAME - 8)) { /* assumption: won't go beyond 9999 */
left[MAX_ID_NAME - 8] = 0;
left[MAX_ID_NAME - 8] = '\0';
left_len = MAX_ID_NAME - 8;
}
else if (left_len > (MAX_ID_NAME - 7)) {
left[MAX_ID_NAME - 7] = 0;
left[MAX_ID_NAME - 7] = '\0';
left_len = MAX_ID_NAME - 7;
}
/* Code above may have generated invalid utf-8 string, due to raw truncation.
* Ensure we get a valid one now! */
left_len -= BLI_utf8_invalid_strip(left, left_len);
for (idtest = lb->first; idtest; idtest = idtest->next) {
int nrtest;
if ( (id != idtest) &&