dot

packages and services management
Log | Files | Refs | README

commit d417ca09c13496b42af45ddc26b917ed76c8e2dd
parent 56cba2a2e0ad515e9d9d552f9cc54bb98174a1fe
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 31 Mar 2018 19:28:45 +0200

temporary quark patch

Diffstat:
Apack/quark/0001-fix-segfault-on-parsing-of-v-and-m.patch | 37+++++++++++++++++++++++++++++++++++++
Tpack/quark/build | 0
2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/pack/quark/0001-fix-segfault-on-parsing-of-v-and-m.patch b/pack/quark/0001-fix-segfault-on-parsing-of-v-and-m.patch @@ -0,0 +1,37 @@ +From 1763adb36eaa8c62c862ab58072287348e94d326 Mon Sep 17 00:00:00 2001 +From: Josuah Demangeon <mail@josuah.net> +Date: Sat, 31 Mar 2018 18:57:50 +0200 +Subject: [PATCH] fix segfault on parsing of -v and -m + +the length is initially 0 so it needs to be incremented before +reallocarray to avoid *alloc(0); and keep some space for the element +to insert +--- + main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/main.c b/main.c +index 9985d31..5f1c6d9 100644 +--- a/main.c ++++ b/main.c +@@ -166,7 +166,7 @@ main(int argc, char *argv[]) + if (!(tok = strdup(EARGF(usage())))) { + die("strdup:"); + } +- if (!(s.vhost = reallocarray(s.vhost, s.vhost_len++, ++ if (!(s.vhost = reallocarray(s.vhost, ++s.vhost_len, + sizeof(struct vhost)))) { + die("reallocarray:"); + } +@@ -182,7 +182,7 @@ main(int argc, char *argv[]) + if (!(tok = strdup(EARGF(usage())))) { + die("strdup:"); + } +- if (!(s.map = reallocarray(s.map, s.map_len++, ++ if (!(s.map = reallocarray(s.map, ++s.map_len, + sizeof(struct map)))) { + die("reallocarray:"); + } +-- +2.10.0 + diff --git a/pack/quark/build b/pack/quark/build