This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1876

bdiff: Handle the possibility of an integer overflow when allocating
AbandonedPublic

Authored by alex_gaynor on Jan 17 2018, 4:36 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
alloc-overflow (bookmark) on default (branch)
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/bdiff.c (2 lines)
Mmercurial/tagmerge.py (1 line)

Diff 4857

mercurial/bdiff.c

/* count the lines */ /* count the lines */
i = 1; /* extra line for sentinel */ i = 1; /* extra line for sentinel */
for (p = a; p < plast; p++) for (p = a; p < plast; p++)
if (*p == '\n') if (*p == '\n')
i++; i++;
if (p == plast) if (p == plast)
i++; i++;
*lr = l = (struct bdiff_line *)malloc(sizeof(struct bdiff_line) * i); *lr = l = (struct bdiff_line *)calloc(i, sizeof(struct bdiff_line));
if (!l) if (!l)
return -1; return -1;
/* build the line array and calculate hashes */ /* build the line array and calculate hashes */
hash = 0; hash = 0;
for (p = a; p < plast; p++) { for (p = a; p < plast; p++) {
hash = HASH(hash, *p); hash = HASH(hash, *p);

mercurial/tagmerge.py

ui.warn(_('automatic .hgtags merge failed\n' ui.warn(_('automatic .hgtags merge failed\n'
'the following %d tags are in conflict: %s\n') 'the following %d tags are in conflict: %s\n')
% (numconflicts, ', '.join(sorted(conflictedtags)))) % (numconflicts, ', '.join(sorted(conflictedtags))))
return True, 1 return True, 1
writemergedtags(fcd, mergedtags) writemergedtags(fcd, mergedtags)
ui.note(_('.hgtags merged successfully\n')) ui.note(_('.hgtags merged successfully\n'))
return False, 0 return False, 0