0
0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00

Merge 10ab9d210455b29233733e742feb732492231c26 into 888d9ab55012d25059da81fed6575ef3a004726f

This commit is contained in:
hongjinghao 2024-11-08 18:33:36 -05:00 committed by GitHub
commit fdf771b4c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions

View File

@ -6953,7 +6953,7 @@ static int expand_mmacro(Token * tline)
*/ */
nasm_newn(paramlen, nparam+1); nasm_newn(paramlen, nparam+1);
for (i = 1; (t = params[i]); i++) { for (i = 1; i < nparam+1 && (t = params[i]); i++) {
bool braced = false; bool braced = false;
int brace = 0; int brace = 0;
int white = 0; int white = 0;

View File

@ -104,8 +104,10 @@ void *nasm_realloc(void *q, size_t size)
void nasm_free(void *q) void nasm_free(void *q)
{ {
if (q) if (q){
free(q); free(q);
q = NULL;
}
} }
char *nasm_strdup(const char *s) char *nasm_strdup(const char *s)