proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-12 01:15:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1801 from ethomson/utf8_bom

Browse Source 
Skip UTF-8 BOM in binary detection
This commit is contained in:
Russell Belfer 2013-08-21 16:57:45 -07:00
commit 6890e00c0e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buf_text.c
View File

@ -170,8 +170,14 @@ int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strings)
bool git_buf_text_is_binary(const git_buf *buf) bool git_buf_text_is_binary(const git_buf *buf)
{ {
const char *scan = buf->ptr, *end = buf->ptr + buf->size; const char *scan = buf->ptr, *end = buf->ptr + buf->size;
git_bom_t bom;
int printable = 0, nonprintable = 0; int printable = 0, nonprintable = 0;
scan += git_buf_text_detect_bom(&bom, buf, 0);
if (bom > GIT_BOM_UTF8)
return 1;
while (scan < end) { while (scan < end) {
unsigned char c = *scan++; unsigned char c = *scan++;

6
tests-clar/core/buffer.c
View File

@ -718,6 +718,8 @@ void test_core_buffer__classify_with_utf8(void)
size_t data1len = 31; size_t data1len = 31;
char *data2 = "Internal NUL!!!\000\n\nI see you!\n"; char *data2 = "Internal NUL!!!\000\n\nI see you!\n";
size_t data2len = 29; size_t data2len = 29;
char *data3 = "\xef\xbb\xbfThis is UTF-8 with a BOM.\n";
size_t data3len = 20;
git_buf b; git_buf b;
b.ptr = data0; b.size = b.asize = data0len; b.ptr = data0; b.size = b.asize = data0len;
@ -731,6 +733,10 @@ void test_core_buffer__classify_with_utf8(void)
b.ptr = data2; b.size = b.asize = data2len; b.ptr = data2; b.size = b.asize = data2len;
cl_assert(git_buf_text_is_binary(&b)); cl_assert(git_buf_text_is_binary(&b));
cl_assert(git_buf_text_contains_nul(&b)); cl_assert(git_buf_text_contains_nul(&b));
b.ptr = data3; b.size = b.asize = data3len;
cl_assert(!git_buf_text_is_binary(&b));
cl_assert(!git_buf_text_contains_nul(&b));
} }
#define SIMILARITY_TEST_DATA_1 \ #define SIMILARITY_TEST_DATA_1 \