diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-21 11:20:18 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-25 22:47:39 +0000 |
| commit | 751eb46247e3d9251de0e6da126aac8fa96b3ad2 (patch) | |
| tree | 35df9f9ebb7eeb48f9b042bcd36132a3077d1e34 | |
| parent | 4947216fa528c0b4a8e1f64a8eb5f9152772cada (diff) | |
| download | libgit2-751eb46247e3d9251de0e6da126aac8fa96b3ad2.tar.gz | |
delta: validate sizes and cast safely
Quiet down a warning from MSVC about how we're potentially losing data.
Validate that our data will fit into the type provided then cast.
| -rw-r--r-- | src/delta.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/delta.c b/src/delta.c index 9e8d1c030..1ff7752c7 100644 --- a/src/delta.c +++ b/src/delta.c @@ -138,7 +138,7 @@ static int lookup_index_alloc( *out = git__malloc(index_len); GIT_ERROR_CHECK_ALLOC(*out); - *out_len = index_len; + *out_len = (unsigned long)index_len; return 0; } @@ -286,6 +286,13 @@ int git_delta_create_from_index( if (!trg_buf || !trg_size) return 0; + if (index->src_size > UINT_MAX || + trg_size > UINT_MAX || + max_size > (UINT_MAX - MAX_OP_SIZE - 1)) { + git_error_set(GIT_ERROR_INVALID, "buffer sizes too large for delta processing"); + return -1; + } + bufpos = 0; bufsize = 8192; if (max_size && bufsize >= max_size) @@ -294,7 +301,7 @@ int git_delta_create_from_index( GIT_ERROR_CHECK_ALLOC(buf); /* store reference buffer size */ - i = index->src_size; + i = (unsigned int)index->src_size; while (i >= 0x80) { buf[bufpos++] = i | 0x80; i >>= 7; @@ -302,7 +309,7 @@ int git_delta_create_from_index( buf[bufpos++] = i; /* store target buffer size */ - i = trg_size; + i = (unsigned int)trg_size; while (i >= 0x80) { buf[bufpos++] = i | 0x80; i >>= 7; @@ -423,7 +430,7 @@ int git_delta_create_from_index( void *tmp = buf; bufsize = bufsize * 3 / 2; if (max_size && bufsize >= max_size) - bufsize = max_size + MAX_OP_SIZE + 1; + bufsize = (unsigned int)(max_size + MAX_OP_SIZE + 1); if (max_size && bufpos > max_size) break; buf = git__realloc(buf, bufsize); |