From f356ebbc13491a98c397920097494958efb042dd Mon Sep 17 00:00:00 2001
From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
Date: Sun, 10 Jun 2018 18:51:58 +0200
Subject: git-receiver: fixed segfault on pre-receive hook

if a [repo:*] section was defined in blogc-git-receiver.ini, but was not
providing a symlink value, that would result in a segfault.
---
 src/blogc-git-receiver/pre-receive.c             |  5 +++++
 tests/blogc-git-receiver/check_pre_receive.sh.in | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/blogc-git-receiver/pre-receive.c b/src/blogc-git-receiver/pre-receive.c
index 9611567..2081b4f 100644
--- a/src/blogc-git-receiver/pre-receive.c
+++ b/src/blogc-git-receiver/pre-receive.c
@@ -125,6 +125,11 @@ bgr_pre_receive_hook(int argc, char *argv[])
     }
 
     const char *sym_tmp = bc_config_get(config, section, "symlink");
+    if (sym_tmp == NULL) {
+        bc_config_free(config);
+        goto default_sym;
+    }
+
     sym = bc_str_starts_with(sym_tmp, "/") ? bc_strdup(sym_tmp) :
             bc_strdup_printf("%s/%s", repo_dir, sym_tmp);
     free(section);
diff --git a/tests/blogc-git-receiver/check_pre_receive.sh.in b/tests/blogc-git-receiver/check_pre_receive.sh.in
index 2a9aa91..41daaf3 100755
--- a/tests/blogc-git-receiver/check_pre_receive.sh.in
+++ b/tests/blogc-git-receiver/check_pre_receive.sh.in
@@ -94,8 +94,6 @@ cat > "${TEMP}/payload.txt" <<EOF
 EOF
 
 cat > "${TEMP}/blogc-git-receiver.ini" <<EOF
-[repo:foo2.git]
-symlink = ${TEMP}/chunda
 [repo:foo2a.git]
 symlink = ${TEMP}/guda
 EOF
@@ -103,6 +101,26 @@ EOF
 SHELL="${SELF}" HOME="${TEMP}" GIT_DIR=. BLOGC_GIT_RECEIVER_BUILDS_DIR="${TEMP}/foooo" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
 grep "echo lol" "${TEMP}/output.txt" &> /dev/null
 
+[[ -h htdocs ]]
+[[ "$(cat htdocs/foo.txt)" == "lol" ]]
+
+cat >> "${TEMP}/blogc-git-receiver.ini" <<EOF
+[repo:foo2.git]
+EOF
+
+SHELL="${SELF}" HOME="${TEMP}" GIT_DIR=. BLOGC_GIT_RECEIVER_BUILDS_DIR="${TEMP}/foooo" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "echo lol" "${TEMP}/output.txt" &> /dev/null
+
+[[ -h htdocs ]]
+[[ "$(cat htdocs/foo.txt)" == "lol" ]]
+
+cat >> "${TEMP}/blogc-git-receiver.ini" <<EOF
+symlink = ${TEMP}/chunda
+EOF
+
+SHELL="${SELF}" HOME="${TEMP}" GIT_DIR=. BLOGC_GIT_RECEIVER_BUILDS_DIR="${TEMP}/foooo" ${TESTS_ENVIRONMENT} ./hooks/pre-receive < "${TEMP}/payload.txt" 2>&1 | tee "${TEMP}/output.txt"
+grep "echo lol" "${TEMP}/output.txt" &> /dev/null
+
 [[ -h "${TEMP}/chunda" ]]
 [[ "$(cat "${TEMP}/chunda/foo.txt")" == "lol" ]]
 
-- 
cgit v1.2.3-18-g5258