MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-03 09:56:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't segfault on invalid utf8 while sorting

Browse Source 
`strmblen` returns -1 on invalid sequences, which causes a segfault when passed as length to `stpncpy`.
This commit is contained in:
Marlies Heijkoop 2014-08-14 20:06:45 +02:00
parent 191ad341c2
commit bbb21b0bad
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/filescanner.c
View File

@ -184,6 +184,7 @@ sort_tag_create(char **sort_tag, char *src_tag)
ucs4_t puc; ucs4_t puc;
int numlen; int numlen;
size_t len; size_t len;
int charlen;
/* Note: include terminating NUL in string length for u8_normalize */ /* Note: include terminating NUL in string length for u8_normalize */
@ -236,7 +237,11 @@ sort_tag_create(char **sort_tag, char *src_tag)
if (number) if (number)
append_number = 1; // A number has ended so time to append it append_number = 1; // A number has ended so time to append it
else else
o_ptr = u8_stpncpy(o_ptr, i_ptr, u8_strmblen(i_ptr)); // No numbers in sight, just append char {
charlen = u8_strmblen(i_ptr);
if (charlen >= 0)
o_ptr = u8_stpncpy(o_ptr, i_ptr, charlen); // No numbers in sight, just append char
}
} }
// Break if less than 100 bytes remain (prevent buffer overflow) // Break if less than 100 bytes remain (prevent buffer overflow)