From: "Ludovic Courtès" <ludo@gnu.org>
To: zimoun <zimon.toutoune@gmail.com>
Cc: 45983@debbugs.gnu.org
Subject: [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json
Date: Tue, 26 Jan 2021 23:17:56 +0100 [thread overview]
Message-ID: <87o8hbwdez.fsf_-_@gnu.org> (raw)
In-Reply-To: <20210119152737.4344-3-zimon.toutoune@gmail.com> (zimoun's message of "Tue, 19 Jan 2021 16:27:37 +0100")
zimoun <zimon.toutoune@gmail.com> skribis:
> Fixes partially <https://bugs.gnu.org/44115>.
>
> * guix/scripts/import/json.scm (guix-import-json): Handle error.
[...]
> - (or (json->code file-name)
> - (leave (G_ "invalid JSON in file '~a'~%") file-name)))
> + (if (file-exists? file-name)
> + (or (json->code file-name)
> + (leave (G_ "invalid JSON in file '~a'~%") file-name))
> + (leave (G_ "invalid file name~%"))))
I’d suggest this:
(catch 'system-error
(lambda ()
(or (json->code …) …))
(lambda args
(leave (G_ "failed to access '~a': ~a~%")
file-name (strerror (system-error-errno args)))))
This avoids TOCTTOU and gives details about the failure.
Could you send updated patches?
Thanks,
Ludo’.
next prev parent reply other threads:[~2021-01-26 22:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 15:25 [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json zimoun
2021-01-19 15:27 ` [bug#45983] [PATCH 1/3] import: gnu: Add internationalized messages zimoun
2021-01-19 15:27 ` [bug#45983] [PATCH 2/3] guix: gnu-maintenance: Fix error handling zimoun
2021-01-19 15:27 ` [bug#45983] [PATCH 3/3] scripts: import: json: " zimoun
2021-01-26 22:17 ` Ludovic Courtès [this message]
2021-01-26 22:14 ` [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json Ludovic Courtès
2021-01-27 23:46 ` [bug#45983] [PATCH v2 1/3] guix: gnu-maintenance: Fix error handling zimoun
2021-01-27 23:46 ` [bug#45983] [PATCH v2 2/3] import: gnu: Add internationalized messages zimoun
2021-01-31 20:37 ` bug#45983: [PATCH 0/3] Fix non-recursive importers gnu and json Ludovic Courtès
2021-01-27 23:46 ` [bug#45983] [PATCH v2 3/3] scripts: import: json: Fix error handling zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8hbwdez.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=45983@debbugs.gnu.org \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).