From f5cfbc6f48582bc5e85aac41823290bf32826a65 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Thu, 3 Sep 2020 11:14:44 -0700 Subject: [PATCH] 1. Updated makefile to build filewatcher for pi 2. Fixed crash when zipping multiple files --- makefile | 2 -- microscript/ILibDuktape_CompressedStream.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 70eff86..1c76399 100644 --- a/makefile +++ b/makefile @@ -303,7 +303,6 @@ ARCHNAME = armhf #STRIP = arm-linux-gnueabihf-strip KVM = 1 LMS = 0 -CFLAGS += -D_NOFSWATCHER CEXTRA = -fno-strict-aliasing endif @@ -314,7 +313,6 @@ ARCHNAME = arm64 #STRIP = arm-linux-gnueabihf-strip KVM = 1 LMS = 0 -CFLAGS += -D_NOFSWATCHER CEXTRA = -fno-strict-aliasing endif diff --git a/microscript/ILibDuktape_CompressedStream.c b/microscript/ILibDuktape_CompressedStream.c index fea406c..7ad5d7c 100644 --- a/microscript/ILibDuktape_CompressedStream.c +++ b/microscript/ILibDuktape_CompressedStream.c @@ -44,8 +44,10 @@ typedef struct ILibDuktape_CompressorStream void ILibDuktape_Compressor_Resume(ILibDuktape_DuplexStream *sender, void *user) { ILibDuktape_CompressorStream *cs = (ILibDuktape_CompressorStream*)user; - - ILibDuktape_DuplexStream_Ready(cs->ds); + if (ILibMemory_CanaryOK(cs) && ILibMemory_CanaryOK(cs->ds)) + { + ILibDuktape_DuplexStream_Ready(cs->ds); + } } void ILibDuktape_Compressor_Pause(ILibDuktape_DuplexStream *sender, void *user) {