<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/0ec5c0335de61ee96416bee8d1e28943bad0e729">https://github.com/macports/macports-base/commit/0ec5c0335de61ee96416bee8d1e28943bad0e729</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0ec5c033 pextlib1.0: refactor file closing
</span>0ec5c033 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ec5c0335de61ee96416bee8d1e28943bad0e729
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Feb 12 10:06:31 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> pextlib1.0: refactor file closing
</span>---
src/pextlib1.0/sip_copy_proc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/sip_copy_proc.c b/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;color:#808080;'>index b1ba249c..233c48f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +169,6 @@ static copy_needed_return_t copy_needed(const char *path, char *const argv[],
</span> char *ctxt;
char *word;
size_t idx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(f);
</span> // do word splitting on the interpreter line and store it in new_argv
for (idx = 0, word = strtok_r(linep, " \t\n", &ctxt);
word != NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,6 +177,7 @@ static copy_needed_return_t copy_needed(const char *path, char *const argv[],
</span> if (new_argv == NULL) {
if ((new_argv = malloc(2 * sizeof(*new_argv))) == NULL) {
free(linep);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(f);
</span> return copy_needed_error;
}
new_argc = 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,6 +192,7 @@ static copy_needed_return_t copy_needed(const char *path, char *const argv[],
</span> if ((new_argv = realloc(oldargv, (idx + 2) * sizeof(*new_argv))) == NULL) {
free_argv(oldargv);
free(linep);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(f);
</span> return copy_needed_error;
}
new_argc = idx + 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,6 +203,7 @@ static copy_needed_return_t copy_needed(const char *path, char *const argv[],
</span> if (!new_argv[idx]) {
free_argv(new_argv);
free(linep);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(f);
</span> return copy_needed_error;
}
new_argv[idx + 1] = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,12 +215,9 @@ static copy_needed_return_t copy_needed(const char *path, char *const argv[],
</span> // interpreter found, check that instead of given path
realpath = *new_argv;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(f);
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fclose(f);
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(f);
</span>
// check whether the binary has SF_RESTRICTED and isn't SUID/SGID
if (-1 == stat(realpath, st)) {
</pre><pre style='margin:0'>
</pre>