* [PATCH] index-pack: do not segfault when keep_name is NULL
@ 2014-03-16 10:31 Nguyễn Thái Ngọc Duy
2014-03-17 22:07 ` Junio C Hamano
2014-03-17 23:07 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
0 siblings, 2 replies; 4+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2014-03-16 10:31 UTC (permalink / raw
To: git; +Cc: Junio C Hamano, Nguyễn Thái Ngọc Duy
keep_name is used to print error messages a couple lines down. Reset
it to the real path returned by odb_pack_keep() if it's set to NULL by
caller.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
One of these moments I will make git log and friends optionally recognize
"Diff-Options:" line in commit message. Adding -U14 in this case
should help the reviewer to see how those error messages are printed.
builtin/index-pack.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a6b1c17..d95c3dc 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1283,9 +1283,10 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
if (keep_msg) {
int keep_fd, keep_msg_len = strlen(keep_msg);
- if (!keep_name)
+ if (!keep_name) {
keep_fd = odb_pack_keep(name, sizeof(name), sha1);
- else
+ keep_name = name;
+ } else
keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
if (keep_fd < 0) {
--
1.9.0.40.gaa8c3ea
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] index-pack: do not segfault when keep_name is NULL
2014-03-16 13:34 [PATCH 0/4] Better "gc --aggressive" Nguyễn Thái Ngọc Duy
@ 2014-03-16 13:35 ` Nguyễn Thái Ngọc Duy
0 siblings, 0 replies; 4+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2014-03-16 13:35 UTC (permalink / raw
To: git; +Cc: Nguyễn Thái Ngọc Duy
keep_name is used to print error messages a couple lines down. Reset
it to the real path returned by odb_pack_keep() if it's set to NULL by
caller.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
One of these moments I will make git log and friends optionally recognize
"Diff-Options:" line in commit message. Adding -U14 in this case
should help the reviewer to see how those error messages are printed.
builtin/index-pack.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a6b1c17..d95c3dc 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1283,9 +1283,10 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
if (keep_msg) {
int keep_fd, keep_msg_len = strlen(keep_msg);
- if (!keep_name)
+ if (!keep_name) {
keep_fd = odb_pack_keep(name, sizeof(name), sha1);
- else
+ keep_name = name;
+ } else
keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
if (keep_fd < 0) {
--
1.9.0.40.gaa8c3ea
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] index-pack: do not segfault when keep_name is NULL
2014-03-16 10:31 [PATCH] index-pack: do not segfault when keep_name is NULL Nguyễn Thái Ngọc Duy
@ 2014-03-17 22:07 ` Junio C Hamano
2014-03-17 23:07 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2014-03-17 22:07 UTC (permalink / raw
To: Nguyễn Thái Ngọc Duy; +Cc: git
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> keep_name is used to print error messages a couple lines down. Reset
> it to the real path returned by odb_pack_keep() if it's set to NULL by
> caller.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> One of these moments I will make git log and friends optionally recognize
> "Diff-Options:" line in commit message. Adding -U14 in this case
> should help the reviewer to see how those error messages are printed.
>
> builtin/index-pack.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index a6b1c17..d95c3dc 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -1283,9 +1283,10 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
> if (keep_msg) {
> int keep_fd, keep_msg_len = strlen(keep_msg);
>
> - if (!keep_name)
> + if (!keep_name) {
> keep_fd = odb_pack_keep(name, sizeof(name), sha1);
> - else
> + keep_name = name;
> + } else
> keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600);
I think this fixes the right problem in a wrong way that hurts
longer-term maintainability. Why not do
keep_name ? keep_name : name
at the place where the name is used? Otherwise you will have to
worry about affecting later codepaths that may want to try to use
!keep_name to switch between two codepaths, no?
>
> if (keep_fd < 0) {
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] index-pack: do not segfault when keep_name is NULL
2014-03-16 10:31 [PATCH] index-pack: do not segfault when keep_name is NULL Nguyễn Thái Ngọc Duy
2014-03-17 22:07 ` Junio C Hamano
@ 2014-03-17 23:07 ` Nguyễn Thái Ngọc Duy
1 sibling, 0 replies; 4+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2014-03-17 23:07 UTC (permalink / raw
To: git; +Cc: Junio C Hamano, Nguyễn Thái Ngọc Duy
Use the name that is returned by odb_pack_keep() when the caller
passes NULL in keep_name.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/index-pack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a6b1c17..b9f6e12 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1291,7 +1291,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
if (keep_fd < 0) {
if (errno != EEXIST)
die_errno(_("cannot write keep file '%s'"),
- keep_name);
+ keep_name ? keep_name : name);
} else {
if (keep_msg_len > 0) {
write_or_die(keep_fd, keep_msg, keep_msg_len);
@@ -1299,7 +1299,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
}
if (close(keep_fd) != 0)
die_errno(_("cannot close written keep file '%s'"),
- keep_name);
+ keep_name ? keep_name : name);
report = "keep";
}
}
--
1.9.0.40.gaa8c3ea
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-17 23:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-16 10:31 [PATCH] index-pack: do not segfault when keep_name is NULL Nguyễn Thái Ngọc Duy
2014-03-17 22:07 ` Junio C Hamano
2014-03-17 23:07 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
-- strict thread matches above, loose matches on Subject: below --
2014-03-16 13:34 [PATCH 0/4] Better "gc --aggressive" Nguyễn Thái Ngọc Duy
2014-03-16 13:35 ` [PATCH] index-pack: do not segfault when keep_name is NULL Nguyễn Thái Ngọc Duy
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).