Fossil SCM
blob_to_utf8_no_bom(): the starts_with_utf16(le|be)_bom calls were swapped.
Commit
d27cddf17cc25c5248091de5292e63f457ab92b8
Parent
77cd6e0dfb25263…
1 file changed
+2
-2
+2
-2
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -1104,19 +1104,19 @@ | ||
| 1104 | 1104 | blob_zero(&temp); |
| 1105 | 1105 | blob_append(&temp, zUtf8, -1); |
| 1106 | 1106 | blob_swap(pBlob, &temp); |
| 1107 | 1107 | blob_reset(&temp); |
| 1108 | 1108 | #ifdef _WIN32 |
| 1109 | - }else if( starts_with_utf16be_bom(pBlob, &bomSize) ){ | |
| 1109 | + }else if( starts_with_utf16le_bom(pBlob, &bomSize) ){ | |
| 1110 | 1110 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1111 | 1111 | blob_append(pBlob, "", 1); |
| 1112 | 1112 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1113 | 1113 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1114 | 1114 | blob_zero(pBlob); |
| 1115 | 1115 | blob_append(pBlob, zUtf8, -1); |
| 1116 | 1116 | fossil_mbcs_free(zUtf8); |
| 1117 | - }else if( starts_with_utf16le_bom(pBlob, &bomSize) ){ | |
| 1117 | + }else if( starts_with_utf16be_bom(pBlob, &bomSize) ){ | |
| 1118 | 1118 | unsigned int i = blob_size(pBlob); |
| 1119 | 1119 | zUtf8 = blob_buffer(pBlob); |
| 1120 | 1120 | while( i > 0 ){ |
| 1121 | 1121 | /* swap bytes of unicode representation */ |
| 1122 | 1122 | char zTemp = zUtf8[--i]; |
| 1123 | 1123 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1104,19 +1104,19 @@ | |
| 1104 | blob_zero(&temp); |
| 1105 | blob_append(&temp, zUtf8, -1); |
| 1106 | blob_swap(pBlob, &temp); |
| 1107 | blob_reset(&temp); |
| 1108 | #ifdef _WIN32 |
| 1109 | }else if( starts_with_utf16be_bom(pBlob, &bomSize) ){ |
| 1110 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1111 | blob_append(pBlob, "", 1); |
| 1112 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1113 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1114 | blob_zero(pBlob); |
| 1115 | blob_append(pBlob, zUtf8, -1); |
| 1116 | fossil_mbcs_free(zUtf8); |
| 1117 | }else if( starts_with_utf16le_bom(pBlob, &bomSize) ){ |
| 1118 | unsigned int i = blob_size(pBlob); |
| 1119 | zUtf8 = blob_buffer(pBlob); |
| 1120 | while( i > 0 ){ |
| 1121 | /* swap bytes of unicode representation */ |
| 1122 | char zTemp = zUtf8[--i]; |
| 1123 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1104,19 +1104,19 @@ | |
| 1104 | blob_zero(&temp); |
| 1105 | blob_append(&temp, zUtf8, -1); |
| 1106 | blob_swap(pBlob, &temp); |
| 1107 | blob_reset(&temp); |
| 1108 | #ifdef _WIN32 |
| 1109 | }else if( starts_with_utf16le_bom(pBlob, &bomSize) ){ |
| 1110 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1111 | blob_append(pBlob, "", 1); |
| 1112 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1113 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1114 | blob_zero(pBlob); |
| 1115 | blob_append(pBlob, zUtf8, -1); |
| 1116 | fossil_mbcs_free(zUtf8); |
| 1117 | }else if( starts_with_utf16be_bom(pBlob, &bomSize) ){ |
| 1118 | unsigned int i = blob_size(pBlob); |
| 1119 | zUtf8 = blob_buffer(pBlob); |
| 1120 | while( i > 0 ){ |
| 1121 | /* swap bytes of unicode representation */ |
| 1122 | char zTemp = zUtf8[--i]; |
| 1123 |