summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-23 19:29:05 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-23 19:29:05 -0700
commit1259404c7e5cd88b7f6692986469cd20cbfacdad (patch)
treecadffdf850a06e1d41ce1ebf4d1290e8d5768cfc /daemon.c
parentb4aee09e610567529dc619d7324dc2fe85a11db5 (diff)
parenta153adf683d2b6e22c7e892ed8a161b140156186 (diff)
downloadgit-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.gz
Merge branch 'maint'
* maint: gitweb: Fix setting $/ in parse_commit() daemon: do not die on older clients. xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. git-clone: honor --quiet Documentation for the [remote] config prune-packed: Fix uninitialized variable.
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index ad8492873e..e66bb802da 100644
--- a/daemon.c
+++ b/daemon.c
@@ -450,6 +450,8 @@ void fill_in_extra_table_entries(struct interp *itable)
* Replace literal host with lowercase-ized hostname.
*/
hp = interp_table[INTERP_SLOT_HOST].value;
+ if (!hp)
+ return;
for ( ; *hp; hp++)
*hp = tolower(*hp);
@@ -544,8 +546,10 @@ static int execute(struct sockaddr *addr)
loginfo("Extended attributes (%d bytes) exist <%.*s>",
(int) pktlen - len,
(int) pktlen - len, line + len + 1);
- if (len && line[len-1] == '\n')
+ if (len && line[len-1] == '\n') {
line[--len] = 0;
+ pktlen--;
+ }
/*
* Initialize the path interpolation table for this connection.