From fcf4d8dcad84091b89db3f161134235421fc0ddb Mon Sep 17 00:00:00 2001
From: meme <18178821+meme@users.noreply.github.com>
Date: Thu, 27 May 2021 10:27:04 -0400
Subject: [PATCH] Add size parameter to r_magic_load_buffer ##util (#18760)

It is still UTF-8, and thus not valid to have a NULL inside of the the
file, but sometimes inputs are not NULL-terminated
---
 libr/include/r_magic.h  |  2 +-
 libr/magic/apprentice.c |  6 +++---
 libr/magic/file.h       |  2 +-
 libr/magic/magic.c      | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libr/include/r_magic.h b/libr/include/r_magic.h
index 9a912aee16..1f2304c6a5 100644
--- a/libr/include/r_magic.h
+++ b/libr/include/r_magic.h
@@ -284,7 +284,7 @@ R_API const char *r_magic_error(RMagic*);
 R_API void r_magic_setflags(RMagic*, int);
 
 R_API bool r_magic_load(RMagic*, const char *);
-R_API bool r_magic_load_buffer(RMagic*, const char *);
+R_API bool r_magic_load_buffer(RMagic*, const ut8 *, size_t);
 R_API bool r_magic_compile(RMagic*, const char *);
 R_API bool r_magic_check(RMagic*, const char *);
 R_API int r_magic_errno(RMagic*);
diff --git a/libr/magic/apprentice.c b/libr/magic/apprentice.c
index 5b3dd8cf6d..7189f1b896 100644
--- a/libr/magic/apprentice.c
+++ b/libr/magic/apprentice.c
@@ -268,7 +268,7 @@ void file_delmagic(struct r_magic *p, int type, size_t entries) {
 }
 
 /* const char *fn: list of magic files and directories */
-struct mlist * file_apprentice(RMagic *ms, const char *fn, int action) {
+struct mlist * file_apprentice(RMagic *ms, const char *fn, size_t fn_size, int action) {
 	char *p, *mfn;
 	int file_err, errs = -1;
 	struct mlist *mlist;
@@ -278,8 +278,8 @@ struct mlist * file_apprentice(RMagic *ms, const char *fn, int action) {
 		return NULL;
 	}
 
-	if (!(mfn = strdup (fn))) {
-		file_oomem (ms, strlen (fn));
+	if (!(mfn = r_str_ndup (fn, fn_size))) {
+		file_oomem (ms, fn_size);
 		return NULL;
 	}
 	fn = mfn;
diff --git a/libr/magic/file.h b/libr/magic/file.h
index 328b0dba0b..2f6109a5f7 100644
--- a/libr/magic/file.h
+++ b/libr/magic/file.h
@@ -65,7 +65,7 @@ int file_zmagic(struct r_magic_set *, int, const char *, const ut8*, size_t);
 int file_ascmagic(struct r_magic_set *, const unsigned char *, size_t);
 int file_is_tar(struct r_magic_set *, const unsigned char *, size_t);
 int file_softmagic(struct r_magic_set *, const unsigned char *, size_t, int);
-struct mlist *file_apprentice(struct r_magic_set *, const char *, int);
+struct mlist *file_apprentice(struct r_magic_set *, const char *, size_t, int);
 ut64 file_signextend(RMagic *, struct r_magic *, ut64);
 void file_delmagic(struct r_magic *, int type, size_t entries);
 void file_badread(struct r_magic_set *);
diff --git a/libr/magic/magic.c b/libr/magic/magic.c
index 6caae2ed46..eb1a51bea1 100644
--- a/libr/magic/magic.c
+++ b/libr/magic/magic.c
@@ -228,9 +228,9 @@ R_API void r_magic_free(RMagic *ms) {
 	}
 }
 
-R_API bool r_magic_load_buffer(RMagic* ms, const char *magicdata) {
-	if (*magicdata == '#') {
-		struct mlist *ml = file_apprentice (ms, magicdata, FILE_LOAD);
+R_API bool r_magic_load_buffer(RMagic* ms, const ut8 *magicdata, size_t magicdata_size) {
+	if (magicdata_size > 0 && *magicdata == '#') {
+		struct mlist *ml = file_apprentice (ms, (const char *)magicdata, magicdata_size, FILE_LOAD);
 		if (ml) {
 			free_mlist (ms->mlist);
 			ms->mlist = ml;
@@ -243,7 +243,7 @@ R_API bool r_magic_load_buffer(RMagic* ms, const char *magicdata) {
 }
 
 R_API bool r_magic_load(RMagic* ms, const char *magicfile) {
-	struct mlist *ml = file_apprentice (ms, magicfile, FILE_LOAD);
+	struct mlist *ml = file_apprentice (ms, magicfile, strlen (magicfile), FILE_LOAD);
 	if (ml) {
 		free_mlist (ms->mlist);
 		ms->mlist = ml;
@@ -253,13 +253,13 @@ R_API bool r_magic_load(RMagic* ms, const char *magicfile) {
 }
 
 R_API bool r_magic_compile(RMagic *ms, const char *magicfile) {
-	struct mlist *ml = file_apprentice (ms, magicfile, FILE_COMPILE);
+	struct mlist *ml = file_apprentice (ms, magicfile, strlen (magicfile), FILE_COMPILE);
 	free_mlist (ml);
 	return ml != NULL;
 }
 
 R_API bool r_magic_check(RMagic *ms, const char *magicfile) {
-	struct mlist *ml = file_apprentice (ms, magicfile, FILE_CHECK);
+	struct mlist *ml = file_apprentice (ms, magicfile, strlen (magicfile), FILE_CHECK);
 	free_mlist (ml);
 	return ml != NULL;
 }