Commit Diff


commit - a48420af0e6a32a59f5fbcc7c78fa642ca2d89a832de5aad1f6234ddf212b326
commit + 7ca4af00fed138807509bf931f240ea9130f6d5566d75b8224c0580710a7b354
blob - cb814807737a16d702aa3adfb183281e221a496983af93e7905c452a1fe3b3dc
blob + e400c81fc72c9c21a2cdfde62cdefa32038ff7dc55d60f0a73a6d0ea1841ed8a
--- cvg/cvg.c	
+++ cvg/cvg.c	
@@ -5424,6 +5424,8 @@ print_tree(const char *path, struct got_commit_object 
 			break;
 
 		te = got_object_tree_get_entry(tree, i);
+		if (te == NULL)
+			break;
 		if (show_ids) {
 			char *id_str;
 			err = got_object_id_str(&id_str,
blob - 249f4b0946decdc80b84a8a3679736f20da2c8b157a59045d782af0f6ff7125f
blob + 42755513038193168635f9be607eab7271f616f55dc3f4044a63ff3c192e800a
--- got/got.c	
+++ got/got.c	
@@ -6298,6 +6298,8 @@ print_tree(const char *path, struct got_commit_object 
 			break;
 
 		te = got_object_tree_get_entry(tree, i);
+		if (te == NULL)
+			break;
 		if (show_ids) {
 			char *id_str;
 			err = got_object_id_str(&id_str,
@@ -14409,6 +14411,8 @@ cat_tree(struct got_object_id *id, struct got_reposito
 		if (sigint_received || sigpipe_received)
 			break;
 		te = got_object_tree_get_entry(tree, i);
+		if (te == NULL)
+			break;
 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
 		if (err)
 			break;
blob - 4ccb2e7afdb14162e69db561086280e202b3e3cfac082863fd50eb9525b5da78
blob + af4a5773e80427d5755eae01a8f03a2c3022c5be9c4e5a64d403932b6c22f2e9
--- gotwebd/got_operations.c	
+++ gotwebd/got_operations.c	
@@ -716,7 +716,18 @@ got_output_repo_tree(struct request *c, char **readme,
 
 	for (i = 0; i < nentries; i++) {
 		te = got_object_tree_get_entry(tree, i);
+		if (te == NULL) {
+			char *id_str;
 
+			error = got_object_id_str(&id_str, tree_id);
+			if (error)
+				break;
+			log_warnx("%s: could not get entry %d of %d in tree %s",
+			    __func__, i + 1, nentries, id_str);
+			free(id_str);
+			break;
+		}
+
 		name = got_tree_entry_get_name(te);
 		mode = got_tree_entry_get_mode(te);
 		if (!S_ISDIR(mode) && (!strcasecmp(name, "README") ||
blob - 50c35a2566682a1e6e1242ef7ba702ba014e58691f61af9a8c011a7940dc414f
blob + b3b12569c4db39c9748e1b8251726cb96d710b9a852b7ec1ad12a228eefb93b2
--- gotwebd/gotweb.c	
+++ gotwebd/gotweb.c	
@@ -543,7 +543,19 @@ gotweb_serve_website(struct request *c, struct website
 			};
 
 			te = got_object_tree_get_entry(tree, i);
+			if (te == NULL) {
+				char *id_str;
 
+				error = got_object_id_str(&id_str, obj_id);
+				if (error)
+					break;
+				error = got_error_fmt(GOT_ERR_BAD_OBJ_DATA,
+				    "could not get entry %d of %d in tree %s",
+				    i + 1, nentries, id_str);
+				free(id_str);
+				goto done;
+			}
+
 			name = got_tree_entry_get_name(te);
 			mode = got_tree_entry_get_mode(te);
 			if (!S_ISREG(mode) ||
blob - 8f39b2d5a4a68a7bfe6810d23e4e867e30aa9851f11157a39319b132024fdfcd
blob + a7ae0262d50901f01a6661a2dd2c814b7576fea12737a1ce301cbbcdf69c8c1d
--- lib/fileindex.c	
+++ lib/fileindex.c	
@@ -874,8 +874,14 @@ walk_tree(struct got_tree_entry **next, struct got_fil
     struct got_fileindex_diff_tree_cb *cb, void *cb_arg)
 {
 	const struct got_error *err = NULL;
-	struct got_tree_entry *te = got_object_tree_get_entry(tree, *tidx);
+	struct got_tree_entry *te;
 
+	*next = NULL;
+
+	te = got_object_tree_get_entry(tree, *tidx);
+	if (te == NULL)
+		return NULL;
+
 	if (!got_object_tree_entry_is_submodule(te) &&
 	    S_ISDIR(got_tree_entry_get_mode(te))) {
 		char *subpath;
blob - ccb247a294c1243f0a1115837da4b96cf3d2cbc89bdf52d7cce2a7bcdf01d577
blob + 2e29868d22b9f1a66c18c61a91f47618a0bd745f8d36a74d0f102a8b8b2cfa8c
--- lib/got_lib_pack_create.h	
+++ lib/got_lib_pack_create.h	
@@ -122,7 +122,7 @@ got_pack_load_packed_object_ids(int *found_all_objects
 const struct got_error *
 got_pack_load_tree_entries(struct got_object_id_queue *ids, int want_meta,
     struct got_object_idset *idset, struct got_object_idset *idset_exclude,
-    struct got_tree_object *tree,
+    struct got_tree_object *tree, const struct got_object_id *tree_id,
     const char *dpath, time_t mtime, uint32_t seed, struct got_repository *repo,
     int loose_obj_only, int *ncolored, int *nfound, int *ntrees,
     got_pack_progress_cb progress_cb, void *progress_arg,
blob - 7f0dad96216b083f7b96ee9146b736efb1ab9bb5a1f98dcb998b3cef0e5f5873
blob + 1c3468a05b104d901e62c67641493fde58162db83d9793c9544cce61bac5167d
--- lib/pack_create.c	
+++ lib/pack_create.c	
@@ -789,7 +789,7 @@ got_pack_add_object(int want_meta, struct got_object_i
 const struct got_error *
 got_pack_load_tree_entries(struct got_object_id_queue *ids, int want_meta,
     struct got_object_idset *idset, struct got_object_idset *idset_exclude,
-    struct got_tree_object *tree,
+    struct got_tree_object *tree, const struct got_object_id *tree_id,
     const char *dpath, time_t mtime, uint32_t seed, struct got_repository *repo,
     int loose_obj_only, int *ncolored, int *nfound, int *ntrees,
     got_pack_progress_cb progress_cb, void *progress_arg,
@@ -811,10 +811,26 @@ got_pack_load_tree_entries(struct got_object_id_queue 
 	p[0] = '\0';
 
 	for (i = 0; i < got_object_tree_get_nentries(tree); i++) {
-		struct got_tree_entry *e = got_object_tree_get_entry(tree, i);
-		struct got_object_id *id = got_tree_entry_get_id(e);
-		mode_t mode = got_tree_entry_get_mode(e);
+		struct got_tree_entry *e;
+		struct got_object_id *id;
+		mode_t mode;
 
+		e = got_object_tree_get_entry(tree, i);
+		if (e == NULL) {
+			char buf[GOT_HASH_DIGEST_STRING_MAXLEN];
+			char *id_str;
+
+			id_str = got_hash_digest_to_str(tree_id->hash, buf,
+			    sizeof(buf), tree_id->algo);
+			err = got_error_fmt(GOT_ERR_BAD_OBJ_DATA,
+			    "cannot get entry %d of %d in tree %s", i + 1,
+			    got_object_tree_get_nentries(tree), id_str);
+			break;
+		}
+
+		id = got_tree_entry_get_id(e);
+		mode = got_tree_entry_get_mode(e);
+
 		if (cancel_cb) {
 			err = (*cancel_cb)(cancel_arg);
 			if (err)
@@ -959,7 +975,7 @@ got_pack_load_tree(int want_meta, struct got_object_id
 		}
 
 		err = got_pack_load_tree_entries(&tree_ids, want_meta, idset,
-		    idset_exclude, tree, path, mtime, seed, repo,
+		    idset_exclude, tree, &qid->id, path, mtime, seed, repo,
 		    loose_obj_only, ncolored, nfound, ntrees,
 		    progress_cb, progress_arg, rl,
 		    cancel_cb, cancel_arg);
blob - 601cadf2a8240757756bac88a756f304670e91b879f951b36ce28b2860d712ff
blob + 2d3f72ec455ad24f8683a5641a379dbc088091ed0fd6c32375626b9d0d3ace47
--- lib/pack_create_privsep.c	
+++ lib/pack_create_privsep.c	
@@ -677,7 +677,7 @@ load_packed_tree_ids(void *arg, struct got_tree_object
 		return err;
 
 	return got_pack_load_tree_entries(NULL, a->want_meta, a->idset,
-	    a->idset_exclude, tree, dpath, mtime, a->seed, repo,
+	    a->idset_exclude, tree, id, dpath, mtime, a->seed, repo,
 	    a->loose_obj_only, a->ncolored, a->nfound, a->ntrees,
 	    a->progress_cb, a->progress_arg, a->rl,
 	    a->cancel_cb, a->cancel_arg);
blob - 2ee8f1e4bb8080b1f1d1c481a3d8dc4cfe9fcff87c3f62b1f1ce8edd7477d357
blob + 61378b16ac8db0807bb2b57ff12e392e698ed3f240c410e22b7143cde57f61bf
--- lib/repository_admin.c	
+++ lib/repository_admin.c	
@@ -855,10 +855,26 @@ load_tree_entries(struct got_object_id_queue *ids,
 		return err;
 
 	for (i = 0; i < got_object_tree_get_nentries(tree); i++) {
-		struct got_tree_entry *e = got_object_tree_get_entry(tree, i);
-		struct got_object_id *id = got_tree_entry_get_id(e);
-		mode_t mode = got_tree_entry_get_mode(e);
+		struct got_tree_entry *e;
+		struct got_object_id *id;
+		mode_t mode;
 
+		e = got_object_tree_get_entry(tree, i);
+		if (e == NULL) {
+			char buf[GOT_HASH_DIGEST_STRING_MAXLEN];
+			char *id_str;
+
+			id_str = got_hash_digest_to_str(tree_id->hash, buf,
+			    sizeof(buf), tree_id->algo);
+			err = got_error_fmt(GOT_ERR_BAD_OBJ_DATA,
+			    "cannot get entry %d of %d in tree %s", i + 1,
+			    got_object_tree_get_nentries(tree), id_str);
+			break;
+		}
+
+		id = got_tree_entry_get_id(e);
+		mode = got_tree_entry_get_mode(e);
+
 		if (cancel_cb) {
 			err = (*cancel_cb)(cancel_arg);
 			if (err)
blob - ef94d066eff2225f9f5b0901492bb49950a7c5e59b94cd348d4ed8ff28576594
blob + b29f4cb6093dac94899b224c287605091a27994d5b991b689f7027c610c6ccf6
--- lib/worktree.c	
+++ lib/worktree.c	
@@ -6313,6 +6313,12 @@ write_tree(struct got_object_id **new_tree_id, int *ne
 			struct got_commitable *ct = NULL;
 
 			te = got_object_tree_get_entry(base_tree, i);
+			if (te == NULL) {
+				err = got_error_fmt(GOT_ERR_BAD_OBJ_DATA,
+				    "cannot get tree entry %d of %d", i + 1,
+				    nbase_entries);
+				goto done;
+			}
 			if (got_object_tree_entry_is_submodule(te)) {
 				/* Entry is a submodule; just copy it. */
 				err = got_object_tree_entry_dup(&new_te, te);
blob - 36c1e727a34e12f3cc02cd1054e4761713d1a4b85b6ecf6b52cfdc36d17378f0
blob + f63e6b884f81d4bdb307d6ae232cd5d2725e640826c28e2f47b9e58d1d91c80f
--- lib/worktree_cvg.c	
+++ lib/worktree_cvg.c	
@@ -2022,6 +2022,12 @@ write_tree(struct got_object_id **new_tree_id, int *ne
 			struct got_commitable *ct = NULL;
 
 			te = got_object_tree_get_entry(base_tree, i);
+			if (te == NULL) {
+				err = got_error_fmt(GOT_ERR_BAD_OBJ_DATA,
+				    "cannot get tree entry %d of %d", i + 1,
+				    nbase_entries);
+				goto done;
+			}
 			if (got_object_tree_entry_is_submodule(te)) {
 				/* Entry is a submodule; just copy it. */
 				err = got_object_tree_entry_dup(&new_te, te);
blob - 1d43adf7fe3cf1039ecae032c62883ca2839f1f428649848b7171830cd3d2666
blob + e28ca80a8685f36f2fdf241c195290bda38d818d927c62601f657776cc29c4cc
--- regress/tog/tree.sh	
+++ regress/tog/tree.sh	
@@ -373,6 +373,50 @@ test_tree_insufficient_height()
 	test_done "$testroot" "$ret"
 }
 
+test_tree_empty()
+{
+	test_init tree_empty 48 8
+
+	(
+	cd $testroot/repo
+
+	blob="$(echo -n '' | git hash-object -w --stdin)"
+	tree="$(echo -n '' | git hash-object -w -t tree --stdin --literally)"
+
+	commit="$(echo cursed | git commit-tree "$tree")"
+	git update-ref refs/heads/main "$commit"
+	git symbolic-ref HEAD refs/heads/main
+	)
+
+	local head_id=`git_show_head $testroot/repo`
+
+	cat <<EOF >$TOG_TEST_SCRIPT
+SCREENDUMP
+EOF
+
+	cat <<EOF >$testroot/view.expected
+$(trim 48 "commit $head_id")
+[1/0] /
+
+
+
+
+
+
+EOF
+
+	cd $testroot/repo && tog tree
+	cmp -s $testroot/view.expected $testroot/view
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		diff -u $testroot/view.expected $testroot/view
+		test_done "$testroot" "$ret"
+		return 1
+	fi
+
+	test_done "$testroot" "$ret"
+}
+
 test_parseargs "$@"
 run_test test_tree_basic
 run_test test_tree_vsplit_blame
@@ -380,3 +424,4 @@ run_test test_tree_hsplit_blame
 run_test test_tree_symlink
 run_test test_tree_commit_keywords
 run_test test_tree_insufficient_height
+run_test test_tree_empty
blob - b0008e8087d94e7cbb75cff81f26de5d6256667cd568614aff73eef0adb3fe2d
blob + 78b349e6bae9c66c6120197622708ea2dc26cfff4433c0f6323e24b00ff55ed9
--- tog/tog.c	
+++ tog/tog.c	
@@ -9025,6 +9025,8 @@ draw_tree_entries(struct tog_view *view, const char *p
 
 	if (s->first_displayed_entry == NULL) {
 		te = got_object_tree_get_first_entry(s->tree);
+		if (te == NULL)
+			return NULL;
 		if (s->selected == 0) {
 			if (view->focussed)
 				wstandout(view->window);
@@ -9049,6 +9051,8 @@ draw_tree_entries(struct tog_view *view, const char *p
 		mode_t mode;
 
 		te = got_object_tree_get_entry(s->tree, i);
+		if (te == NULL)
+			break;
 		mode = got_tree_entry_get_mode(te);
 
 		if (s->show_ids) {
@@ -9481,6 +9485,9 @@ search_next_tree_view(struct tog_view *view)
 				te = got_object_tree_get_first_entry(s->tree);
 			else
 				te = got_object_tree_get_last_entry(s->tree);
+
+			if (te == NULL)
+				break;
 		}
 
 		if (match_tree_entry(te, &view->regex)) {