index-pack: report error using the correct variable
We feed a string pointer that is potentially NULL to die() when showing the message. Don't. Noticed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 17, 2014 at 15:08 UTC
de983a0a1817437fbb0db938ecf91f73023a5f87
1 file changed
+2
-2
builtin/index-pack.c
+2
-2
@@ -1291,7 +1291,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
1291
if (keep_fd < 0) {
1292
if (errno != EEXIST)
1293
die_errno(_("cannot write keep file '%s'"),
1294
- keep_name);
1294
+ keep_name ? keep_name : name);
1295
} else {
1296
if (keep_msg_len > 0) {
1297
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,
1299
}
1300
if (close(keep_fd) != 0)
1301
die_errno(_("cannot close written keep file '%s'"),
1302
- keep_name);
1302
+ keep_name ? keep_name : name);
1303
report = "keep";
1304
}
1305
}