Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua: apply upstream bugfix for "Loading a corrupted binary file can segfault."

This commit is contained in:
nikita 2023-04-17 21:17:57 +00:00
parent d08cb505c1
commit 79fd713a55
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
external/mit/lua/dist/src/ldump.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ldump.c,v 1.10 2023/04/16 20:46:17 nikita Exp $ */
/* $NetBSD: ldump.c,v 1.11 2023/04/17 21:17:57 nikita Exp $ */
/*
** Id: ldump.c
@ -14,6 +14,7 @@
#ifndef _KERNEL
#include <stddef.h>
#include <limits.h>
#endif /* _KERNEL */
#include "lua.h"
@ -59,8 +60,17 @@ static void dumpByte (DumpState *D, int y) {
}
#ifdef _KERNEL
/* dumpInt Buff Size */
#define DIBS ((sizeof(size_t) * 8 / 7) + 1)
#endif /* _KERNEL */
#ifndef _KERNEL
/*
** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
** rounds up the division.)
*/
#define DIBS ((sizeof(size_t) * CHAR_BIT + 6) / 7)
#endif /* _KERNEL */
static void dumpSize (DumpState *D, size_t x) {
lu_byte buff[DIBS];

4
external/mit/lua/dist/src/lundump.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: lundump.c,v 1.9 2023/04/16 20:46:17 nikita Exp $ */
/* $NetBSD: lundump.c,v 1.10 2023/04/17 21:17:57 nikita Exp $ */
/*
** Id: lundump.c
@ -254,6 +254,8 @@ static void loadDebug (LoadState *S, Proto *f) {
f->locvars[i].endpc = loadInt(S);
}
n = loadInt(S);
if (n != 0) /* does it have debug information? */
n = f->sizeupvalues; /* must be this many */
for (i = 0; i < n; i++)
f->upvalues[i].name = loadStringN(S, f);
}