+22 -10

builtin/cat-file.c

··· 71 71 static int cat_one_file(int opt, const char *exp_type, const char *obj_name, 72 72 int unknown_type) 73 73 { 74 74 + int ret; 74 75 struct object_id oid; 75 76 enum object_type type; 76 77 char *buf; ··· 106 107 if (sb.len) { 107 108 printf("%s\n", sb.buf); 108 109 strbuf_release(&sb); 109 109 - return 0; 110 110 + ret = 0; 111 111 + goto cleanup; 110 112 } 111 113 break; 112 114 ··· 115 117 if (oid_object_info_extended(the_repository, &oid, &oi, flags) < 0) 116 118 die("git cat-file: could not get object info"); 117 119 printf("%"PRIuMAX"\n", (uintmax_t)size); 118 118 - return 0; 120 120 + ret = 0; 121 121 + goto cleanup; 119 122 120 123 case 'e': 121 124 return !has_object_file(&oid); ··· 123 126 case 'w': 124 127 125 128 if (filter_object(path, obj_context.mode, 126 126 - &oid, &buf, &size)) 127 127 - return -1; 129 129 + &oid, &buf, &size)) { 130 130 + ret = -1; 131 131 + goto cleanup; 132 132 + } 128 133 break; 129 134 130 135 case 'c': ··· 143 148 const char *ls_args[3] = { NULL }; 144 149 ls_args[0] = "ls-tree"; 145 150 ls_args[1] = obj_name; 146 146 - return cmd_ls_tree(2, ls_args, NULL); 151 151 + ret = cmd_ls_tree(2, ls_args, NULL); 152 152 + goto cleanup; 147 153 } 148 154 149 149 - if (type == OBJ_BLOB) 150 150 - return stream_blob(&oid); 155 155 + if (type == OBJ_BLOB) { 156 156 + ret = stream_blob(&oid); 157 157 + goto cleanup; 158 158 + } 151 159 buf = read_object_file(&oid, &type, &size); 152 160 if (!buf) 153 161 die("Cannot read object %s", obj_name); ··· 172 180 } else 173 181 oidcpy(&blob_oid, &oid); 174 182 175 175 - if (oid_object_info(the_repository, &blob_oid, NULL) == OBJ_BLOB) 176 176 - return stream_blob(&blob_oid); 183 183 + if (oid_object_info(the_repository, &blob_oid, NULL) == OBJ_BLOB) { 184 184 + ret = stream_blob(&blob_oid); 185 185 + goto cleanup; 186 186 + } 177 187 /* 178 188 * we attempted to dereference a tag to a blob 179 189 * and failed; there may be new dereference ··· 193 203 die("git cat-file %s: bad file", obj_name); 194 204 195 205 write_or_die(1, buf, size); 206 206 + ret = 0; 207 207 + cleanup: 196 208 free(buf); 197 209 free(obj_context.path); 198 198 - return 0; 210 210 + return ret; 199 211 } 200 212 201 213 struct expand_data {

+1

t/t0028-working-tree-encoding.sh

··· 5 5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 6 6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 7 7 8 8 + TEST_PASSES_SANITIZE_LEAK=true 8 9 . ./test-lib.sh 9 10 . "$TEST_DIRECTORY/lib-encoding.sh" 10 11

+2

t/t1051-large-conversion.sh

··· 1 1 #!/bin/sh 2 2 3 3 test_description='test conversion filters on large files' 4 4 + 5 5 + TEST_PASSES_SANITIZE_LEAK=true 4 6 . ./test-lib.sh 5 7 6 8 set_attr() {

+1

t/t3304-notes-mixed.sh

··· 5 5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 6 6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 7 7 8 8 + TEST_PASSES_SANITIZE_LEAK=true 8 9 . ./test-lib.sh 9 10 10 11 number_of_commits=100

+2

t/t4044-diff-index-unique-abbrev.sh

··· 1 1 #!/bin/sh 2 2 3 3 test_description='test unique sha1 abbreviation on "index from..to" line' 4 4 + 5 5 + TEST_PASSES_SANITIZE_LEAK=true 4 6 . ./test-lib.sh 5 7 6 8 test_expect_success 'setup' '

+1

t/t4140-apply-ita.sh

··· 2 2 3 3 test_description='git apply of i-t-a file' 4 4 5 5 + TEST_PASSES_SANITIZE_LEAK=true 5 6 . ./test-lib.sh 6 7 7 8 test_expect_success setup '

+2 -2

t/t5314-pack-cycle-detection.sh

··· 49 49 will always find a delta for "file", because its lookup will always come 50 50 immediately after the lookup for "dummy". 51 51 ' 52 52 - . ./test-lib.sh 53 53 - 54 52 53 53 + TEST_PASSES_SANITIZE_LEAK=true 54 54 + . ./test-lib.sh 55 55 56 56 # Create a pack containing the tree $1 and blob $1:file, with 57 57 # the latter stored as a delta against $2:file.

+1

t/t6422-merge-rename-corner-cases.sh

··· 6 6 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 7 7 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 8 8 9 9 + TEST_PASSES_SANITIZE_LEAK=true 9 10 . ./test-lib.sh 10 11 . "$TEST_DIRECTORY"/lib-merge.sh 11 12

+2

t/t8007-cat-file-textconv.sh

··· 1 1 #!/bin/sh 2 2 3 3 test_description='git cat-file textconv support' 4 4 + 5 5 + TEST_PASSES_SANITIZE_LEAK=true 4 6 . ./test-lib.sh 5 7 6 8 cat >helper <<'EOF'

+2

t/t8010-cat-file-filters.sh

··· 1 1 #!/bin/sh 2 2 3 3 test_description='git cat-file filters support' 4 4 + 5 5 + TEST_PASSES_SANITIZE_LEAK=true 4 6 . ./test-lib.sh 5 7 6 8 test_expect_success 'setup ' '

-1

t/t9104-git-svn-follow-parent.sh

··· 5 5 6 6 test_description='git svn fetching' 7 7 8 8 - TEST_FAILS_SANITIZE_LEAK=true 9 8 . ./lib-git-svn.sh 10 9 11 10 test_expect_success 'initialize repo' '

-1

t/t9132-git-svn-broken-symlink.sh

··· 2 2 3 3 test_description='test that git handles an svn repository with empty symlinks' 4 4 5 5 - TEST_FAILS_SANITIZE_LEAK=true 6 5 . ./lib-git-svn.sh 7 6 test_expect_success 'load svn dumpfile' ' 8 7 svnadmin load "$rawsvnrepo" <<EOF

+1

t/t9301-fast-import-notes.sh

··· 7 7 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 8 8 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 9 9 10 10 + TEST_PASSES_SANITIZE_LEAK=true 10 11 . ./test-lib.sh 11 12 12 13