git: update to v2.23.0

[ps-cgit] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 8007a1181224b8360c85d1553c5045263d12acba..5a964108e51e5f553536899cb6b79922e25e1288 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -11,13 +11,16 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

+/* two commit hashes with two dots in between and termination */
+#define REV_RANGE_LEN 2 * GIT_MAX_HEXSZ + 3
+

 void cgit_print_patch(const char *new_rev, const char *old_rev,
                      const char *prefix)
 {
        struct rev_info rev;
        struct commit *commit;
        struct object_id new_rev_oid, old_rev_oid;
 void cgit_print_patch(const char *new_rev, const char *old_rev,
                      const char *prefix)
 {
        struct rev_info rev;
        struct commit *commit;
        struct object_id new_rev_oid, old_rev_oid;

-       char rev_range[2 * 40 + 3];
+       char rev_range[REV_RANGE_LEN];

        const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
        int rev_argc = ARRAY_SIZE(rev_argv) - 1;
        char *patchname;
        const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
        int rev_argc = ARRAY_SIZE(rev_argv) - 1;
        char *patchname;


@@ -33,7 +36,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                "Bad object id: %s", new_rev);
                return;
        }
                                "Bad object id: %s", new_rev);
                return;
        }

-       commit = lookup_commit_reference(&new_rev_oid);
+       commit = lookup_commit_reference(the_repository, &new_rev_oid);

        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", new_rev);
        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", new_rev);


@@ -46,7 +49,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                        "Bad object id: %s", old_rev);
                        return;
                }
                                        "Bad object id: %s", old_rev);
                        return;
                }

-               if (!lookup_commit_reference(&old_rev_oid)) {
+               if (!lookup_commit_reference(the_repository, &old_rev_oid)) {

                        cgit_print_error_page(404, "Not found",
                                        "Bad commit reference: %s", old_rev);
                        return;
                        cgit_print_error_page(404, "Not found",
                                        "Bad commit reference: %s", old_rev);
                        return;


@@ -60,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
        if (is_null_oid(&old_rev_oid)) {
                memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
        } else {
        if (is_null_oid(&old_rev_oid)) {
                memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
        } else {

-               sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid),
+               xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),

                        oid_to_hex(&new_rev_oid));
        }
 
                        oid_to_hex(&new_rev_oid));
        }