mirrors/file
0
0
Fork 0
mirror of https://github.com/file/file.git synced 2024-11-27 03:48:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR/561: jsummers: Properly nul terminate {b,l}estring16

Browse Source
This commit is contained in:
Christos Zoulas 2024-11-09 23:00:13 +00:00
parent 0dea0bb3a3
commit 2625465625
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/softmagic.c
View File

@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
FILE_RCSID("@(#)$File: softmagic.c,v 1.346 2024/07/19 18:30:25 christos Exp $")
FILE_RCSID("@(#)$File: softmagic.c,v 1.347 2024/11/09 23:00:13 christos Exp $")
#endif /* lint */
#include "magic.h"
@ -651,6 +651,7 @@ mprint(struct magic_set *ms, struct magic *m)
case FILE_BESTRING16:
case FILE_LESTRING16:
if (m->reln == '=' || m->reln == '!') {
fprintf(stderr, "[%s]\n", m->value.s);
if (file_printf(ms, F(ms, desc, "%s"),
file_printable(ms, sbuf, sizeof(sbuf), m->value.s,
sizeof(m->value.s))) == -1)
@ -659,6 +660,7 @@ mprint(struct magic_set *ms, struct magic *m)
else {
char *str = p->s;
fprintf(stderr, "!!!!!%s!!!\n", p->s);
/* compute t before we mangle the string? */
if (*m->value.s == '\0')
@ -1417,6 +1419,7 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
}
}
*edst = '\0';
*dst = '\0';
return 0;
}
case FILE_STRING: /* XXX - these two should not need */