luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 01:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Got Claude Opus to investigate and correct an error when reading

Browse Source 
plane property data---A bug was causing this to fail for lines of
coordinates exceeding the original allocated string size.  This only
happens in unusual use-cases but the error needed to be fixed
nonetheless.  Considered adding a line extension method but decided
against it.
This commit is contained in:
R. Timothy Edwards
2026-08-26 16:26:30 -04:00
parent 4432d7ec00
commit 307e22af30
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
8.3.681
8.3.682
database/DBio.c
+23 -8
View File
@@ -2457,30 +2457,44 @@ dbReadProperties(cellDef, line, len, f, scalen, scaled)
/* Read the string value from the file, accounting for overflow */
pvalueptr = &propertyvalue[0];
/* Handle string overflows in property values */
/* Handle string overflows in property values. If "line" was */
/* filled completely by dbFgets() without finding a newline, */
/* then the property value scanned above was cut off where */
/* "line" was cut off, and more of it remains to be read. */
/* Keep appending 2048-byte chunks, always writing the next */
/* chunk at the current end of the string (per strlen()), until */
/* a chunk is read that is not itself cut off at the boundary. */
/* (Code issue corrected by Claude Opus, 8/26/2026) */
if (line[len - 1] == '\0')
{
int pvlen = strlen(pvalueptr);
*(pvalueptr + pvlen - 1) = '\0';
int curlen = strlen(pvalueptr);
while (*(pvalueptr + pvlen - 1) == '\0')
while (TRUE)
{
char *newpvalue;
int newsize = curlen + 2048;
pvlen += 2048;
newpvalue = (char *)mallocMagic(pvlen);
newpvalue = (char *)mallocMagic(newsize);
strcpy(newpvalue, pvalueptr);
if (pvalueptr != &propertyvalue[0])
freeMagic(pvalueptr);
pvalueptr = newpvalue;
*(pvalueptr + pvlen - 1) = 'X';
if (dbFgets(newpvalue + pvlen - 2048, 2048, f) == NULL)
/* Sentinel: detect whether dbFgets() fills this */
/* entire new chunk, meaning there is still more to */
/* read. */
*(pvalueptr + newsize - 1) = 'X';
if (dbFgets(pvalueptr + curlen, 2048, f) == NULL)
{
/* Oops, hit end-of-file in the middle of a property */
freeMagic(pvalueptr);
cellDef->cd_flags |= noeditflag;
return (TRUE);
}
if (*(pvalueptr + newsize - 1) != '\0') break;
curlen = strlen(pvalueptr);
}
/* "pvalueptr" now points to a string containing the complete
@@ -2592,6 +2606,7 @@ dbReadProperties(cellDef, line, len, f, scalen, scaled)
{
Rect r;
while (isspace(*pptr) && (*pptr != '\0')) pptr++;
if (*pptr == '\0') break;
if (!isspace(*pptr))
{
if (sscanf(pptr, "%d", &ival) != 1)