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

Added some more checks and initialization.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4800 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2010-08-09 15:52:23 +00:00
parent b936617eb4
commit 3f7fc55c7e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dbginfo/dbginfo.c
View File

@@ -54,7 +54,7 @@
/* Version numbers of the debug format we understand */ /* Version numbers of the debug format we understand */
#define VER_MAJOR 1U #define VER_MAJOR 1U
#define VER_MINOR 0U #define VER_MINOR 0U
/* Dynamic strings */ /* Dynamic strings */
typedef struct StrBuf StrBuf; typedef struct StrBuf StrBuf;
@@ -1663,11 +1663,22 @@ static void ParseSegment (InputData* D)
goto ErrorExit; goto ErrorExit;
} }
/* Check for required information */ /* Check for required and/or matched information */
if ((InfoBits & ibRequired) != ibRequired) { if ((InfoBits & ibRequired) != ibRequired) {
ParseError (D, CC65_ERROR, "Required attributes missing"); ParseError (D, CC65_ERROR, "Required attributes missing");
goto ErrorExit; goto ErrorExit;
} }
InfoBits &= (ibOutputName | ibOutputOffs);
if (InfoBits != ibNone && InfoBits != (ibOutputName | ibOutputOffs)) {
ParseError (D, CC65_ERROR,
"Attributes \"outputname\" and \"outputoffs\" must be paired");
goto ErrorExit;
}
/* Fix OutputOffs if not given */
if (InfoBits == ibNone) {
OutputOffs = 0;
}
/* Create the segment info and remember it */ /* Create the segment info and remember it */
S = NewSegInfo (&SegName, Id, Start, Size, &OutputName, OutputOffs); S = NewSegInfo (&SegName, Id, Start, Size, &OutputName, OutputOffs);