mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
cabinet: Avoid signed-unsigned integer comparisons.
This commit is contained in:
parent
93348b21f7
commit
d03b13c534
1 changed files with 5 additions and 3 deletions
|
@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
|
||||||
/* outlen=0 means this block was the last contiguous part
|
/* outlen=0 means this block was the last contiguous part
|
||||||
of a split block, continued in the next cabinet */
|
of a split block, continued in the next cabinet */
|
||||||
if (outlen == 0) {
|
if (outlen == 0) {
|
||||||
int pathlen, filenamelen, i;
|
int pathlen, filenamelen;
|
||||||
INT_PTR cabhf;
|
INT_PTR cabhf;
|
||||||
char fullpath[MAX_PATH], userpath[256];
|
char fullpath[MAX_PATH], userpath[256];
|
||||||
FDINOTIFICATION fdin;
|
FDINOTIFICATION fdin;
|
||||||
|
@ -2056,6 +2056,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
|
||||||
|
|
||||||
/* set up the next decomp_state... */
|
/* set up the next decomp_state... */
|
||||||
if (!(cab->next)) {
|
if (!(cab->next)) {
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
if (!cab->mii.hasnext) return DECR_INPUT;
|
if (!cab->mii.hasnext) return DECR_INPUT;
|
||||||
|
|
||||||
if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state)))))
|
if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state)))))
|
||||||
|
@ -2695,13 +2697,13 @@ BOOL __cdecl FDICopy(
|
||||||
|
|
||||||
/* find the folder for this file if necc. */
|
/* find the folder for this file if necc. */
|
||||||
if (filehf) {
|
if (filehf) {
|
||||||
int i2;
|
|
||||||
|
|
||||||
fol = CAB(firstfol);
|
fol = CAB(firstfol);
|
||||||
if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) {
|
if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) {
|
||||||
/* pick the last folder */
|
/* pick the last folder */
|
||||||
while (fol->next) fol = fol->next;
|
while (fol->next) fol = fol->next;
|
||||||
} else {
|
} else {
|
||||||
|
unsigned int i2;
|
||||||
|
|
||||||
for (i2 = 0; (i2 < file->index); i2++)
|
for (i2 = 0; (i2 < file->index); i2++)
|
||||||
if (fol->next) /* bug resistance, should always be true */
|
if (fol->next) /* bug resistance, should always be true */
|
||||||
fol = fol->next;
|
fol = fol->next;
|
||||||
|
|
Loading…
Reference in a new issue