commit - 470daf1e6c462ed3f8e9136b2de69711e8b443f227a3a94f2cf1898fa909df0a
commit + ada5f162499576f0ff8a10320baf70872ec476464db0188eac110e14b05cca6a
blob - e0a33320a9f17a4f6a16bdef73b2ff8770361d0c0e836db2bc537618363e2cc1
blob + e1b672a7af2d406bfb0fd5dca28e594eb497342308c2b99b8060ee3811f9bb58
--- lib/diff_atomize_text.c
+++ lib/diff_atomize_text.c
unsigned int array_size_estimate = d->len / 50;
unsigned int pow2 = 1;
bool ignore_whitespace = (d->diff_flags & DIFF_FLAG_IGNORE_WHITESPACE);
- bool embedded_nul = false;
+ bool isbinary = false;
while (array_size_estimate >>= 1)
pow2++;
|| !isspace((unsigned char)buf[i]))
hash = diff_atom_hash_update(
hash, buf[i]);
- if (buf[i] == '\0')
- embedded_nul = true;
+ if (iscntrl((unsigned char)buf[i]) &&
+ !isspace((unsigned char)buf[i]))
+ isbinary = true;
line_end++;
} else
eol = buf[i];
return errno;
}
- /* File are considered binary if they contain embedded '\0' bytes. */
- if (embedded_nul)
+ /* File are considered binary if they contain control bytes. */
+ if (isbinary)
d->atomizer_flags |= DIFF_ATOMIZER_FOUND_BINARY_DATA;
return DIFF_RC_OK;
const uint8_t *pos = d->data;
const uint8_t *end = pos + d->len;
bool ignore_whitespace = (d->diff_flags & DIFF_FLAG_IGNORE_WHITESPACE);
- bool embedded_nul = false;
+ bool isbinary = false;
unsigned int array_size_estimate = d->len / 50;
unsigned int pow2 = 1;
while (array_size_estimate >>= 1)
if (!ignore_whitespace
|| !isspace((unsigned char)*line_end))
hash = diff_atom_hash_update(hash, *line_end);
- if (*line_end == '\0')
- embedded_nul = true;
+ if (iscntrl((unsigned char)*line_end) &&
+ !isspace((unsigned char)*line_end))
+ isbinary = true;
line_end++;
}
pos = line_end;
}
- /* File are considered binary if they contain embedded '\0' bytes. */
- if (embedded_nul)
+ /* File are considered binary if they contain embedded control bytes. */
+ if (isbinary)
d->atomizer_flags |= DIFF_ATOMIZER_FOUND_BINARY_DATA;
return DIFF_RC_OK;