the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2824 from GrosChien/master

Browse Source 
ca65 Fixing segfault when using `--expend-macros` without `--listing`
This commit is contained in:
Bob Andrews
2025-09-22 21:18:39 +02:00
committed by GitHub
parent 8ec38c38d5 ee096d27df
commit 93c1b659ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ca65/macro.c
View File

@@ -728,7 +728,7 @@ ExpandParam:
/* Use next macro token */ /* Use next macro token */
TokSet (Mac->Exp); TokSet (Mac->Exp);
if (ExpandMacros) { if (ExpandMacros && SB_GetLen (&ListingName) > 0) {
if (new_expand_line) { if (new_expand_line) {
/* Suppress unneeded lines if short expansion /* Suppress unneeded lines if short expansion
** the ExpandStart is used to ensure that ** the ExpandStart is used to ensure that

2
src/ca65/toklist.c
View File

@@ -252,7 +252,7 @@ static int ReplayTokList (void* List)
/* see description in macro.c */ /* see description in macro.c */
static int new_expand_line = 1; static int new_expand_line = 1;
if (ExpandMacros) { if (ExpandMacros && SB_GetLen (&ListingName) > 0) {
if (new_expand_line) { if (new_expand_line) {
if (LineLast->FragList == 0 && ExpandMacros==1) { if (LineLast->FragList == 0 && ExpandMacros==1) {
LineCur->Output--; LineCur->Output--;