logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 80b9e8f11dfe52b3c45d65679bd167eb9888c4af
parent 0b563f2a71bffbca603869770bd89b745d95afa2
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  4 Jun 2019 17:54:21 -0700

blind: Use malloc instead of alloca

Diffstat:

M.gitmodules1+
Apkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch35+++++++++++++++++++++++++++++++++++
Mpkg/blind/ver2+-
3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules @@ -19,6 +19,7 @@ [submodule "pkg/blind/src"] path = pkg/blind/src url = git://git.suckless.org/blind + ignore = all [submodule "pkg/cmark/src"] path = pkg/cmark/src url = https://github.com/commonmark/cmark diff --git a/pkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch b/pkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch @@ -0,0 +1,35 @@ +From 17e5acf6ce56870838bef5235fdb381d7e6d7327 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 1 Jun 2019 14:57:42 -0700 +Subject: [PATCH] Use malloc instead of alloca + +--- + src/blind-split.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/blind-split.c b/src/blind-split.c +index e92fced..201fb6e 100644 +--- a/src/blind-split.c ++++ b/src/blind-split.c +@@ -2,7 +2,6 @@ + #include "stream.h" + #include "util.h" + +-#include <alloca.h> + #include <fcntl.h> + #include <inttypes.h> + #include <limits.h> +@@ -38,8 +37,8 @@ main(int argc, char *argv[]) + eprintf("%s: video is too large\n", stream.file); + + parts = (size_t)argc / 2; +- ends = alloca(parts * sizeof(*ends)); +- to_end = alloca(parts); ++ ends = emalloc(parts * sizeof(*ends)); ++ to_end = emalloc(parts); + + for (i = 0; i < parts; i++) { + to_end[i] = 0; +-- +2.20.1 + diff --git a/pkg/blind/ver b/pkg/blind/ver @@ -1 +1 @@ -1.1 r0 +1.1 r1