<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/a7c00b40cc8760e7e44f504a6c3adea5887d4738">https://github.com/macports/macports-base/commit/a7c00b40cc8760e7e44f504a6c3adea5887d4738</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a7c00b40cc8760e7e44f504a6c3adea5887d4738
</span>Author: Ryan Carsten Schmidt <git@ryandesign.com>
AuthorDate: Wed Sep 25 02:50:47 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> cp: NULL-terminate new_argv
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70897
</span>---
src/programs/cp/cp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/programs/cp/cp.c b/src/programs/cp/cp.c
</span><span style='display:block; white-space:pre;color:#808080;'>index f6b74491e..6869ed101 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/programs/cp/cp.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/programs/cp/cp.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +9,11 @@ int main(int argc, char *argv[])
</span> {
const char *cp_path = "/bin/cp";
const char *clone_arg = "-c";
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const char **new_argv = malloc(sizeof(char *) * (argc+1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char **new_argv = malloc(sizeof(char *) * (argc+2));
</span> if (new_argv) {
new_argv[0] = cp_path;
new_argv[1] = clone_arg;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 1; i < argc; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 1; i <= argc; i++) {
</span> new_argv[i+1] = argv[i];
}
execv(cp_path, new_argv);
</pre><pre style='margin:0'>
</pre>