diff options
| author | midipix <writeonce@midipix.org> | 2024-02-23 07:13:51 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-23 07:13:51 +0000 |
| commit | 30e15bfa0d6e215fa91cc3b76604829541a3188e (patch) | |
| tree | 687ce1d1097a8ce5d0306082ade4442ecc0b24a6 | |
| parent | ac4a1be9a6897a4843f6a93c1e27a9e603b44623 (diff) | |
| download | slibtool-30e15bfa0d6e215fa91cc3b76604829541a3188e.tar.bz2 slibtool-30e15bfa0d6e215fa91cc3b76604829541a3188e.tar.xz | |
slbt_exec_link_finalize_argument_vector(): fix large vector alloc code path.
| -rw-r--r-- | src/logic/linkcmd/slbt_linkcmd_argv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c index 321d7d0..0f6f195 100644 --- a/src/logic/linkcmd/slbt_linkcmd_argv.c +++ b/src/logic/linkcmd/slbt_linkcmd_argv.c @@ -717,6 +717,7 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector( const struct slbt_driver_ctx * dctx, struct slbt_exec_ctx * ectx) { + size_t nargs; char * sargv[1024]; char ** sargvbuf; char ** base; @@ -762,7 +763,7 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector( } /* buffer */ - if ((parg - base) + (mark - argv) < 256) { + if ((nargs = ((parg - base) + (mark - argv))) < 256) { aargv = &sargv[0]; oargv = &sargv[1*256]; lobjv = &sargv[2*256]; @@ -775,14 +776,14 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector( for (; parg<pcap; ) *parg++ = 0; - } else if (!(sargvbuf = calloc(3*(parg-base+1),sizeof(char *)))) { + } else if (!(sargvbuf = calloc(4*(nargs+1),sizeof(char *)))) { return SLBT_SYSTEM_ERROR(dctx,0); } else { aargv = &sargvbuf[0]; - oargv = &sargvbuf[1*(parg-base+1)]; - lobjv = &sargvbuf[2*(parg-base+1)]; - cnvlv = &sargvbuf[3*(parg-base+1)]; + oargv = &sargvbuf[1*(nargs+1)]; + lobjv = &sargvbuf[2*(nargs+1)]; + cnvlv = &sargvbuf[3*(nargs+1)]; } aarg = aargv; |