Archives
/
cgit
mirror of https://git.zx2c4.com/cgit/
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use GIT-1.7.3

Browse Source 
This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542.

Noticed-by: Silvio Cesare <silvio.cesare@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
lh/pretty-blob-view
Lars Hjemli 14 years ago
parent aaa3f78542
commit 82a883ede7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
Makefile
Unescape Escape View File

@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
CGIT_CONFIG = /etc/cgitrc CGIT_CONFIG = /etc/cgitrc
CACHE_ROOT = /var/cache/cgit CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h> SHA1_HEADER = <openssl/sha.h>
GIT_VER = 1.6.4.3 GIT_VER = 1.7.3
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
INSTALL = install INSTALL = install
@ -68,7 +68,7 @@ endif
$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
OBJECTS = OBJECTS =
OBJECTS += cache.o OBJECTS += cache.o
OBJECTS += cgit.o OBJECTS += cgit.o

2
cgit.c
Unescape Escape View File

@ -21,7 +21,7 @@ void add_mimetype(const char *name, const char *value)
{ {
struct string_list_item *item; struct string_list_item *item;
item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name));
item->util = xstrdup(value); item->util = xstrdup(value);
} }

2
git

@ -1 +1 @@
Subproject commit 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4 Subproject commit 87b50542a08ac6caa083ddc376e674424e37940a

2
ui-plain.c
Unescape Escape View File

@ -35,7 +35,7 @@ static void print_object(const unsigned char *sha1, const char *path)
ctx.page.mimetype = NULL; ctx.page.mimetype = NULL;
ext = strrchr(path, '.'); ext = strrchr(path, '.');
if (ext && *(++ext)) { if (ext && *(++ext)) {
mime = string_list_lookup(ext, &ctx.cfg.mimetypes); mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
if (mime) if (mime)
ctx.page.mimetype = (char *)mime->util; ctx.page.mimetype = (char *)mime->util;
} }

8
ui-stats.c
Unescape Escape View File

@ -175,7 +175,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
tmp = xstrdup(info->author); tmp = xstrdup(info->author);
author = string_list_insert(tmp, authors); author = string_list_insert(authors, tmp);
if (!author->util) if (!author->util)
author->util = xcalloc(1, sizeof(struct authorstat)); author->util = xcalloc(1, sizeof(struct authorstat));
else else
@ -186,7 +186,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
date = gmtime(&t); date = gmtime(&t);
period->trunc(date); period->trunc(date);
tmp = xstrdup(period->pretty(date)); tmp = xstrdup(period->pretty(date));
item = string_list_insert(tmp, items); item = string_list_insert(items, tmp);
if (item->util) if (item->util)
free(tmp); free(tmp);
item->util++; item->util++;
@ -279,7 +279,7 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
author = &authors->items[i]; author = &authors->items[i];
authorstat = author->util; authorstat = author->util;
items = &authorstat->list; items = &authorstat->list;
date = string_list_lookup(tmp, items); date = string_list_lookup(items, tmp);
if (date) if (date)
subtotal += (size_t)date->util; subtotal += (size_t)date->util;
} }
@ -331,7 +331,7 @@ void print_authors(struct string_list *authors, int top,
for (j = 0; j < period->count; j++) { for (j = 0; j < period->count; j++) {
tmp = period->pretty(tm); tmp = period->pretty(tm);
period->inc(tm); period->inc(tm);
date = string_list_lookup(tmp, items); date = string_list_lookup(items, tmp);
if (!date) if (!date)
html("<td>0</td>"); html("<td>0</td>");
else { else {

Write Preview
Loading…
Cancel
Save