commit 602a75efe10fcb783fc4f55029c5b0d74a8e926e
parent 0a0f45fb2d1ea2f868c88143afd52a1a446176ae
Author: falkTX <falktx@gmail.com>
Date: Tue, 2 Oct 2018 08:24:48 +0200
Merge branch 'master' of github.com:DISTRHO/DPF into pugl-update
Diffstat:
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
@@ -77,12 +77,12 @@ all:
# Common
$(BUILD_DIR)/%.c.o: %.c
- -@mkdir -p $(BUILD_DIR)
+ -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
@$(CC) $< $(BUILD_C_FLAGS) -c -o $@
$(BUILD_DIR)/%.cpp.o: %.cpp
- -@mkdir -p $(BUILD_DIR)
+ -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
diff --git a/distrho/src/DistrhoPluginVST.cpp b/distrho/src/DistrhoPluginVST.cpp
@@ -71,18 +71,21 @@ static const writeMidiFunc writeMidiCallback = nullptr;
void strncpy(char* const dst, const char* const src, const size_t size)
{
- std::strncpy(dst, src, size-1);
+ DISTRHO_SAFE_ASSERT_RETURN(size > 0,);
+ std::memcpy(dst, src, std::min(std::strlen(src), size-1));
dst[size-1] = '\0';
}
void snprintf_param(char* const dst, const float value, const size_t size)
{
+ DISTRHO_SAFE_ASSERT_RETURN(size > 0,);
std::snprintf(dst, size-1, "%f", value);
dst[size-1] = '\0';
}
void snprintf_iparam(char* const dst, const int32_t value, const size_t size)
{
+ DISTRHO_SAFE_ASSERT_RETURN(size > 0,);
std::snprintf(dst, size-1, "%d", value);
dst[size-1] = '\0';
}