From d5e265d7dd720175c97d296cf1b3851f8bb89857 Mon Sep 17 00:00:00 2001
From: jpark37 <jpark37@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:12:44 -0700
Subject: [PATCH] libobs/util: Fix warnings for about null usages

---
 libobs/util/darray.h | 4 +++-
 libobs/util/dstr.h   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libobs/util/darray.h b/libobs/util/darray.h
index dc726938f..a4a0e2931 100644
--- a/libobs/util/darray.h
+++ b/libobs/util/darray.h
@@ -409,8 +409,10 @@ static inline void darray_move_item(const size_t element_size,
 		return;
 
 	temp = malloc(element_size);
-	if (!temp)
+	if (!temp) {
 		bcrash("darray_move_item: out of memory");
+		return;
+	}
 
 	p_from = darray_item(element_size, dst, from);
 	p_to = darray_item(element_size, dst, to);
diff --git a/libobs/util/dstr.h b/libobs/util/dstr.h
index 4f0294888..e03e86de3 100644
--- a/libobs/util/dstr.h
+++ b/libobs/util/dstr.h
@@ -229,8 +229,7 @@ static inline void dstr_ensure_capacity(struct dstr *dst, const size_t new_size)
 
 static inline void dstr_copy_dstr(struct dstr *dst, const struct dstr *src)
 {
-	if (dst->array)
-		dstr_free(dst);
+	dstr_free(dst);
 
 	if (src->len) {
 		dstr_ensure_capacity(dst, src->len + 1);