proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 23:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make tree cache name a flex-array

Browse Source 
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
This commit is contained in:
Carlos Martín Nieto 2011-07-26 12:26:12 +02:00 committed by Vicent Marti
parent b41713206b
commit b183ffe77e
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tree-cache.c
View File

@ -14,12 +14,7 @@ static int read_tree_internal(git_tree_cache **out,
const char *name_start, *buffer; const char *name_start, *buffer;
int count; int count;
int error = GIT_SUCCESS; int error = GIT_SUCCESS;
size_t name_len;
if ((tree = git__malloc(sizeof(git_tree_cache))) == NULL)
return GIT_ENOMEM;
memset(tree, 0x0, sizeof(git_tree_cache));
tree->parent = parent;
buffer = name_start = *buffer_in; buffer = name_start = *buffer_in;
@ -28,18 +23,22 @@ static int read_tree_internal(git_tree_cache **out,
goto cleanup; goto cleanup;
} }
/* NUL-terminated tree name */
tree->name = git__strdup(name_start);
if (tree->name == NULL) {
error = GIT_ENOMEM;
goto cleanup;
}
if (++buffer >= buffer_end) { if (++buffer >= buffer_end) {
error = GIT_EOBJCORRUPTED; error = GIT_EOBJCORRUPTED;
goto cleanup; goto cleanup;
} }
name_len = strlen(name_start);
if ((tree = git__malloc(sizeof(git_tree_cache) + name_len + 1)) == NULL)
return GIT_ENOMEM;
memset(tree, 0x0, sizeof(git_tree_cache));
tree->parent = parent;
/* NUL-terminated tree name */
memcpy(tree->name, name_start, name_len);
tree->name[name_len] = '\0';
/* Blank-terminated ASCII decimal number of entries in this tree */ /* Blank-terminated ASCII decimal number of entries in this tree */
if (git__strtol32(&count, buffer, &buffer, 10) < GIT_SUCCESS || count < -1) { if (git__strtol32(&count, buffer, &buffer, 10) < GIT_SUCCESS || count < -1) {
error = GIT_EOBJCORRUPTED; error = GIT_EOBJCORRUPTED;
@ -135,7 +134,6 @@ void git_tree_cache_free(git_tree_cache *tree)
for (i = 0; i < tree->children_count; ++i) for (i = 0; i < tree->children_count; ++i)
git_tree_cache_free(tree->children[i]); git_tree_cache_free(tree->children[i]);
free(tree->name);
free(tree->children); free(tree->children);
free(tree); free(tree);
} }

3
src/tree-cache.h
View File

@ -12,14 +12,13 @@
#include "git2/oid.h" #include "git2/oid.h"
struct git_tree_cache { struct git_tree_cache {
char *name;
struct git_tree_cache *parent; struct git_tree_cache *parent;
struct git_tree_cache **children; struct git_tree_cache **children;
size_t children_count; size_t children_count;
ssize_t entries; ssize_t entries;
git_oid oid; git_oid oid;
char name[GIT_FLEX_ARRAY];
}; };
typedef struct git_tree_cache git_tree_cache; typedef struct git_tree_cache git_tree_cache;