refs: convert parameter of search_ref_dir() to length-limited string
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
May 22, 2012 at 20:50 UTC
40ad937d47d6649a022f12f463ee39e83b1d9663
1 file changed
+7
-6
refs.c
+7
-6
@@ -319,19 +319,19 @@ static void sort_ref_dir(struct ref_dir *dir);
319
* (non-recursively), sorting dir if necessary. Return NULL if no
320
* such entry is found. dir must already be complete.
321
*/
322
-static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname)
322
+static struct ref_entry *search_ref_dir(struct ref_dir *dir,
323
+ const char *refname, size_t len)
324
{
325
struct ref_entry *e, **r;
325
- int len;
326
327
if (refname == NULL || !dir->nr)
328
return NULL;
329
330
sort_ref_dir(dir);
331
332
- len = strlen(refname) + 1;
333
- e = xmalloc(sizeof(struct ref_entry) + len);
332
+ e = xmalloc(sizeof(struct ref_entry) + len + 1);
333
memcpy(e->name, refname, len);
334
+ e->name[len] = '\0';
335
336
r = bsearch(&e, dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp);
337
@@ -353,7 +353,8 @@ static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname
353
static struct ref_dir *search_for_subdir(struct ref_dir *dir,
354
const char *subdirname, int mkdir)
355
{
356
- struct ref_entry *entry = search_ref_dir(dir, subdirname);
356
+ size_t len = strlen(subdirname);
357
+ struct ref_entry *entry = search_ref_dir(dir, subdirname, len);
358
if (!entry) {
359
if (!mkdir)
360
return NULL;
@@ -412,7 +413,7 @@ static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname)
413
dir = find_containing_dir(dir, refname, 0);
414
if (!dir)
415
return NULL;
415
- entry = search_ref_dir(dir, refname);
416
+ entry = search_ref_dir(dir, refname, strlen(refname));
417
return (entry && !(entry->flag & REF_DIR)) ? entry : NULL;
418
}
419