admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xdiff: avoid signed vs. unsigned comparisons in xutils.c

Browse Source 
The comparisons all involve comparisons against unsigned values.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2025-02-11 22:04:18 -08:00
committed by Junio C Hamano
parent 13b67f15c1
commit a3b56f5f43
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xdiff/xutils.c
View File

@@ -20,8 +20,6 @@
* *
*/ */
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "xinclude.h" #include "xinclude.h"
@@ -377,7 +375,7 @@ static int xdl_format_hunk_hdr(long s1, long c1, long s2, long c2,
nb += 3; nb += 3;
if (func && funclen) { if (func && funclen) {
buf[nb++] = ' '; buf[nb++] = ' ';
if (funclen > sizeof(buf) - nb - 1) if ((size_t)funclen > sizeof(buf) - nb - 1)
funclen = sizeof(buf) - nb - 1; funclen = sizeof(buf) - nb - 1;
memcpy(buf + nb, func, funclen); memcpy(buf + nb, func, funclen);
nb += funclen; nb += funclen;
@@ -439,7 +437,7 @@ void* xdl_alloc_grow_helper(void *p, long nr, long *alloc, size_t size)
{ {
void *tmp = NULL; void *tmp = NULL;
size_t n = ((LONG_MAX - 16) / 2 >= *alloc) ? 2 * *alloc + 16 : LONG_MAX; size_t n = ((LONG_MAX - 16) / 2 >= *alloc) ? 2 * *alloc + 16 : LONG_MAX;
if (nr > n) if ((size_t)nr > n)
n = nr; n = nr;
if (SIZE_MAX / size >= n) if (SIZE_MAX / size >= n)
tmp = xdl_realloc(p, n * size); tmp = xdl_realloc(p, n * size);