mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge branch 'master' of https://github.com/jp9000/obs-studio

Browse Source
This commit is contained in:
jp9000 2014-04-19 06:34:13 -07:00
commit 79b88c4cbb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libobs/util/platform.c
View File

@ -108,6 +108,8 @@ size_t os_fread_utf8(FILE *file, char **pstr)
size_t size_read;
size_t len = 0;
*pstr = NULL;
fseeko(file, 0, SEEK_END);
size = (size_t)ftello(file);
@ -125,6 +127,9 @@ size_t os_fread_utf8(FILE *file, char **pstr)
offset = (astrcmp_n(bom, "\xEF\xBB\xBF", 3) == 0) ? 3 : 0;
size -= offset;
if (size == 0)
return 0;
utf8str = bmalloc(size+1);
fseeko(file, offset, SEEK_SET);
@ -137,8 +142,6 @@ size_t os_fread_utf8(FILE *file, char **pstr)
utf8str[size] = 0;
*pstr = utf8str;
} else {
*pstr = NULL;
}
return len;