mirror of
https://github.com/git/git
synced 2024-07-02 15:48:44 +00:00
5aa02f9868
The make_traverse_path() function isn't very careful about checking its
output buffer boundaries. In fact, it doesn't even _know_ the size of
the buffer it's writing to, and just assumes that the caller used
traverse_path_len() correctly. And even then we assume that our
traverse_info.pathlen components are all correct, and just blindly write
into the buffer.
Let's improve this situation a bit:
- have the caller pass in their allocated buffer length, which we'll
check against our own computations
- check for integer underflow as we do our backwards-insertion of
pathnames into the buffer
- check that we do not run out items in our list to traverse before
we've filled the expected number of bytes
None of these should be triggerable in practice (especially since our
switch to size_t everywhere in a previous commit), but it doesn't hurt
to check our assumptions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
2.9 KiB
C
100 lines
2.9 KiB
C
#ifndef TREE_WALK_H
|
|
#define TREE_WALK_H
|
|
|
|
#include "cache.h"
|
|
|
|
struct name_entry {
|
|
struct object_id oid;
|
|
const char *path;
|
|
int pathlen;
|
|
unsigned int mode;
|
|
};
|
|
|
|
struct tree_desc {
|
|
const void *buffer;
|
|
struct name_entry entry;
|
|
unsigned int size;
|
|
};
|
|
|
|
static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned short *modep)
|
|
{
|
|
*pathp = desc->entry.path;
|
|
*modep = desc->entry.mode;
|
|
return &desc->entry.oid;
|
|
}
|
|
|
|
static inline int tree_entry_len(const struct name_entry *ne)
|
|
{
|
|
return ne->pathlen;
|
|
}
|
|
|
|
/*
|
|
* The _gently versions of these functions warn and return false on a
|
|
* corrupt tree entry rather than dying,
|
|
*/
|
|
|
|
void update_tree_entry(struct tree_desc *);
|
|
int update_tree_entry_gently(struct tree_desc *);
|
|
void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
|
|
int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size);
|
|
|
|
/*
|
|
* Helper function that does both tree_entry_extract() and update_tree_entry()
|
|
* and returns true for success
|
|
*/
|
|
int tree_entry(struct tree_desc *, struct name_entry *);
|
|
int tree_entry_gently(struct tree_desc *, struct name_entry *);
|
|
|
|
void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
|
|
|
|
struct traverse_info;
|
|
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
|
|
int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info);
|
|
|
|
enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
|
|
|
|
struct traverse_info {
|
|
const char *traverse_path;
|
|
struct traverse_info *prev;
|
|
const char *name;
|
|
size_t namelen;
|
|
unsigned mode;
|
|
|
|
size_t pathlen;
|
|
struct pathspec *pathspec;
|
|
|
|
unsigned long df_conflicts;
|
|
traverse_callback_t fn;
|
|
void *data;
|
|
int show_all_errors;
|
|
};
|
|
|
|
int get_tree_entry(const struct object_id *, const char *, struct object_id *, unsigned short *);
|
|
char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info,
|
|
const char *name, size_t namelen);
|
|
void strbuf_make_traverse_path(struct strbuf *out,
|
|
const struct traverse_info *info,
|
|
const char *name, size_t namelen);
|
|
void setup_traverse_info(struct traverse_info *info, const char *base);
|
|
|
|
static inline size_t traverse_path_len(const struct traverse_info *info,
|
|
size_t namelen)
|
|
{
|
|
return st_add(info->pathlen, namelen);
|
|
}
|
|
|
|
/* in general, positive means "kind of interesting" */
|
|
enum interesting {
|
|
all_entries_not_interesting = -1, /* no, and no subsequent entries will be either */
|
|
entry_not_interesting = 0,
|
|
entry_interesting = 1,
|
|
all_entries_interesting = 2 /* yes, and all subsequent entries will be */
|
|
};
|
|
|
|
enum interesting tree_entry_interesting(struct index_state *istate,
|
|
const struct name_entry *,
|
|
struct strbuf *, int,
|
|
const struct pathspec *ps);
|
|
|
|
#endif
|