Fossil SCM

Since the blob size is unsigned, looks_like_utf16() cannot easily process the content if the size is not even.

mistachkin 2013-03-07 09:56 trunk
Commit 32b8fc7dcddf6893fc7236e73b0deeb21382a38a
1 file changed +1 -1
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -333,11 +333,11 @@
333333
334334
if( pFlags ) *pFlags = LOOK_NONE;
335335
if( n==0 ) return result; /* Empty file -> text */
336336
if( n%2 ){
337337
if( pFlags ) *pFlags |= LOOK_ODD;
338
- result = 0; /* Odd number of bytes -> binary (or UTF-8) */
338
+ return 0; /* Odd number of bytes -> binary (or UTF-8) */
339339
}
340340
c = *z;
341341
if( c==0 ){
342342
if( pFlags ) *pFlags |= LOOK_NUL;
343343
result = 0; /* NUL character in a file -> binary */
344344
--- src/diff.c
+++ src/diff.c
@@ -333,11 +333,11 @@
333
334 if( pFlags ) *pFlags = LOOK_NONE;
335 if( n==0 ) return result; /* Empty file -> text */
336 if( n%2 ){
337 if( pFlags ) *pFlags |= LOOK_ODD;
338 result = 0; /* Odd number of bytes -> binary (or UTF-8) */
339 }
340 c = *z;
341 if( c==0 ){
342 if( pFlags ) *pFlags |= LOOK_NUL;
343 result = 0; /* NUL character in a file -> binary */
344
--- src/diff.c
+++ src/diff.c
@@ -333,11 +333,11 @@
333
334 if( pFlags ) *pFlags = LOOK_NONE;
335 if( n==0 ) return result; /* Empty file -> text */
336 if( n%2 ){
337 if( pFlags ) *pFlags |= LOOK_ODD;
338 return 0; /* Odd number of bytes -> binary (or UTF-8) */
339 }
340 c = *z;
341 if( c==0 ){
342 if( pFlags ) *pFlags |= LOOK_NUL;
343 result = 0; /* NUL character in a file -> binary */
344

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button