Mageia Bugzilla – Attachment 8565 Details for
Bug 19571
overflow when querying for size with urpmq
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
switch to uint64_t for sizes
0003-switch-to-uint64_t-for-sizes.patch (text/plain), 2.68 KB, created by
Thierry Vignaud
on 2016-10-18 03:48:23 CEST
(
hide
)
Description:
switch to uint64_t for sizes
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2016-10-18 03:48:23 CEST
Size:
2.68 KB
patch
obsolete
>From 24f4c6265af20f7e21fc8cf8b60012e63b0b0d06 Mon Sep 17 00:00:00 2001 >From: Thierry Vignaud <thierry.vignaud@gmail.com> >Date: Tue, 18 Oct 2016 03:40:50 +0200 >Subject: [PATCH 3/4] switch to uint64_t for sizes > >--- > URPM.xs | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > >diff --git a/URPM.xs b/URPM.xs >index 1da6de2..e633fa8 100644 >--- a/URPM.xs >+++ b/URPM.xs >@@ -50,7 +50,7 @@ typedef struct rpmSpec_s * Spec; > > struct s_Package { > Header h; >- int filesize; >+ uint64_t filesize; > unsigned flag; > char *info; > char *requires; >@@ -213,7 +213,7 @@ get_int(const Header header, rpmTag tag) { > return rpmtdGetNumber(&val); > } > >-static size_t >+static uint64_t > get_filesize(const Header h) { > return headerGetNumber(h, RPMTAG_SIGSIZE) + 440; /* 440 is the rpm header size (?) empirical, but works */ > } >@@ -1051,7 +1051,7 @@ parse_line(AV *depslist, HV *provides, HV *obsoletes, URPM__Package pkg, char *b > // reset package, next line will be for another one > memset(pkg, 0, sizeof(struct s_Package)); > } else if (!strcmp(tag, "filesize")) >- pkg->filesize = atoi(data); >+ pkg->filesize = atoll(data); > else { > char **ptr = NULL; > if (!strcmp(tag, "requires")) >@@ -1755,7 +1755,7 @@ Pkg_compare(pkg, evr) > OUTPUT: > RETVAL > >-int >+uint64_t > Pkg_size(pkg) > URPM::Package pkg > CODE: >@@ -1765,7 +1765,7 @@ Pkg_size(pkg) > if ((s = strchr(pkg->info, '@')) != NULL && (s = strchr(s+1, '@')) != NULL) { > if ((eos = strchr(s+1, '@')) != NULL) > *eos = 0; /* mark end of string to enable searching backwards */ >- RETVAL = atoi(s+1); >+ RETVAL = atoll(s+1); > if (eos != NULL) *eos = '@'; > } else > RETVAL = 0; >@@ -1779,11 +1779,11 @@ Pkg_size(pkg) > void > Pkg_set_filesize(pkg, filesize) > URPM::Package pkg >- size_t filesize; >+ uint64_t filesize; > PPCODE: > pkg->filesize = filesize; > >-int >+uint64_t > Pkg_filesize(pkg) > URPM::Package pkg > CODE: >@@ -2091,7 +2091,7 @@ Pkg_build_info(pkg, fileno, provides_files=NULL, recommends=0) > CODE: > if (pkg->info) { > char buff[65536*2]; >- size_t size; >+ uint64_t size; > > /* info line should be the last to be written */ > if (pkg->provides && *pkg->provides) { >@@ -2125,7 +2125,7 @@ Pkg_build_info(pkg, fileno, provides_files=NULL, recommends=0) > if (size < sizeof(buff)) write_nocheck(fileno, buff, size); > } > if (pkg->filesize) { >- size = snprintf(buff, sizeof(buff), "@filesize@%d\n", pkg->filesize); >+ size = snprintf(buff, sizeof(buff), "@filesize@%llu\n", pkg->filesize); > if (size < sizeof(buff)) write_nocheck(fileno, buff, size); > } > size = snprintf(buff, sizeof(buff), "@info@%s\n", pkg->info); >-- >2.10.1 >
From 24f4c6265af20f7e21fc8cf8b60012e63b0b0d06 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud <thierry.vignaud@gmail.com> Date: Tue, 18 Oct 2016 03:40:50 +0200 Subject: [PATCH 3/4] switch to uint64_t for sizes --- URPM.xs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/URPM.xs b/URPM.xs index 1da6de2..e633fa8 100644 --- a/URPM.xs +++ b/URPM.xs @@ -50,7 +50,7 @@ typedef struct rpmSpec_s * Spec; struct s_Package { Header h; - int filesize; + uint64_t filesize; unsigned flag; char *info; char *requires; @@ -213,7 +213,7 @@ get_int(const Header header, rpmTag tag) { return rpmtdGetNumber(&val); } -static size_t +static uint64_t get_filesize(const Header h) { return headerGetNumber(h, RPMTAG_SIGSIZE) + 440; /* 440 is the rpm header size (?) empirical, but works */ } @@ -1051,7 +1051,7 @@ parse_line(AV *depslist, HV *provides, HV *obsoletes, URPM__Package pkg, char *b // reset package, next line will be for another one memset(pkg, 0, sizeof(struct s_Package)); } else if (!strcmp(tag, "filesize")) - pkg->filesize = atoi(data); + pkg->filesize = atoll(data); else { char **ptr = NULL; if (!strcmp(tag, "requires")) @@ -1755,7 +1755,7 @@ Pkg_compare(pkg, evr) OUTPUT: RETVAL -int +uint64_t Pkg_size(pkg) URPM::Package pkg CODE: @@ -1765,7 +1765,7 @@ Pkg_size(pkg) if ((s = strchr(pkg->info, '@')) != NULL && (s = strchr(s+1, '@')) != NULL) { if ((eos = strchr(s+1, '@')) != NULL) *eos = 0; /* mark end of string to enable searching backwards */ - RETVAL = atoi(s+1); + RETVAL = atoll(s+1); if (eos != NULL) *eos = '@'; } else RETVAL = 0; @@ -1779,11 +1779,11 @@ Pkg_size(pkg) void Pkg_set_filesize(pkg, filesize) URPM::Package pkg - size_t filesize; + uint64_t filesize; PPCODE: pkg->filesize = filesize; -int +uint64_t Pkg_filesize(pkg) URPM::Package pkg CODE: @@ -2091,7 +2091,7 @@ Pkg_build_info(pkg, fileno, provides_files=NULL, recommends=0) CODE: if (pkg->info) { char buff[65536*2]; - size_t size; + uint64_t size; /* info line should be the last to be written */ if (pkg->provides && *pkg->provides) { @@ -2125,7 +2125,7 @@ Pkg_build_info(pkg, fileno, provides_files=NULL, recommends=0) if (size < sizeof(buff)) write_nocheck(fileno, buff, size); } if (pkg->filesize) { - size = snprintf(buff, sizeof(buff), "@filesize@%d\n", pkg->filesize); + size = snprintf(buff, sizeof(buff), "@filesize@%llu\n", pkg->filesize); if (size < sizeof(buff)) write_nocheck(fileno, buff, size); } size = snprintf(buff, sizeof(buff), "@info@%s\n", pkg->info); -- 2.10.1
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 19571
:
8522
|
8523
|
8525
|
8528
|
8529
|
8530
|
8531
|
8537
|
8538
|
8539
|
8541
|
8542
|
8543
|
8547
|
8548
|
8549
|
8563
|
8564
| 8565 |
8566