Merge branch 'jh/fsmonitor-prework'
The fsmonitor interface read from its input without making sure there is something to read from. This bug is new in 2.31 timeframe. * jh/fsmonitor-prework: fsmonitor: avoid global-buffer-overflow READ when checking trivial response
This commit is contained in:
commit
8779c141da
@ -185,10 +185,10 @@ static int query_fsmonitor(int version, const char *last_update, struct strbuf *
|
||||
int fsmonitor_is_trivial_response(const struct strbuf *query_result)
|
||||
{
|
||||
static char trivial_response[3] = { '\0', '/', '\0' };
|
||||
int is_trivial = !memcmp(trivial_response,
|
||||
&query_result->buf[query_result->len - 3], 3);
|
||||
|
||||
return is_trivial;
|
||||
return query_result->len >= 3 &&
|
||||
!memcmp(trivial_response,
|
||||
&query_result->buf[query_result->len - 3], 3);
|
||||
}
|
||||
|
||||
static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
|
||||
|
Loading…
Reference in New Issue
Block a user