Differences From Artifact [26d0132bd7]:

• File src/lookslike.c — part of check-in [1ca598325e] at 2016-06-10 12:03:47 on branch trunk — Slightly more efficient than previous commit (user: jan.nijtmans size: 15974)

To Artifact [c96a3f58ac]:

• File src/lookslike.c — part of check-in [5684672ab7] at 2016-06-13 08:29:06 on branch trunk — Fix handling of byte sequence \xF4\x00 in utf-8 validation. Now all tests pass again. Thanks to Scott Robison for discovering this! (user: jan.nijtmans size: 15974)

155
156
157
158
159
160
161
162
163
164
165
166
167
168
169

  if( n==0 ) return 0;  /* Empty file -> OK */
  c = *z;
  while( --n>0 ){
    c2 = c;
    c = *++z;
    if( c2>=0x80 ){
      if( ((c2<0xc2) || (c2>=0xf4) || ((c&0xc0)!=0x80)) &&
          (((c2!=0xf4) || (c>=0x90)) && ((c2!=0xc0) || (c!=0x80))) ){
        return LOOK_INVALID; /* Invalid UTF-8 */
      }
      if( c2>=0xe0 ){
        if ((c2==0xf0 && c<0x90)||(c2==0xe0 && c<0xa0)){
          return LOOK_INVALID; /* Invalid UTF-8, too short */
        }

|

155
156
157
158
159
160
161
162
163
164
165
166
167
168
169

  if( n==0 ) return 0;  /* Empty file -> OK */
  c = *z;
  while( --n>0 ){
    c2 = c;
    c = *++z;
    if( c2>=0x80 ){
      if( ((c&0xc0)!=0x80) || ((c2<0xc2) || (c2>=0xf4)) &&
          (((c2!=0xf4) || (c>=0x90)) && ((c2!=0xc0) || (c!=0x80))) ){
        return LOOK_INVALID; /* Invalid UTF-8 */
      }
      if( c2>=0xe0 ){
        if ((c2==0xf0 && c<0x90)||(c2==0xe0 && c<0xa0)){
          return LOOK_INVALID; /* Invalid UTF-8, too short */
        }