luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-07 01:19:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

commands: Fix parsing of plane properties in case of single string

Browse Source 
The previous code would iterate over `proplen` chunks of strings
but would not initialize `proplen` for plane properties.

Technically for plane properties you don't need to "pre-count"
the string chunks but given how the code is currently written
it's easier to do the counting in all cases.

Also makes sure proprec is init to NULL so that if argument is
empty, property is set to NULL and not random value on the stack.

Fixes #520

Signed-off-by: Sylvain Munaut <[email protected]>
This commit is contained in:
Sylvain Munaut
2026-05-25 12:49:52 +02:00
parent 7ecebb5dd6
commit e366cf6a4c
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/CmdLQ.c
+19 -19
View File
@@ -2324,7 +2324,7 @@ CmdDoProperty(
TxCommand *cmd,
int argstart)
{
PropertyRecord *proprec;
PropertyRecord *proprec = NULL;
char *value;
bool propfound, dolist;
int proptype, proplen, propvalue, i;
@@ -2662,31 +2662,31 @@ CmdDoProperty(
* the valid number of arguments, then again to parse the
* values, once the property record has been allocated
*/
if (proptype == PROPERTY_TYPE_PLANE)
value = cmd->tx_argv[argstart + 1];
for (proplen = 0; *value != '\0'; )
{
proprec = (PropertyRecord *)mallocMagic(sizeof(PropertyRecord));
plane = DBNewPlane((ClientData)TT_SPACE);
proprec->prop_value.prop_plane = plane;
}
else
{
value = cmd->tx_argv[argstart + 1];
for (proplen = 0; *value != '\0'; )
if (isspace(*value) && (*value != '\0')) value++;
if (!isspace(*value))
{
if (isspace(*value) && (*value != '\0')) value++;
if (!isspace(*value))
{
proplen++;
while (!isspace(*value) && (*value != '\0')) value++;
}
proplen++;
while (!isspace(*value) && (*value != '\0')) value++;
}
if (proplen > 0)
}
if (proplen > 0)
{
if (proptype == PROPERTY_TYPE_PLANE)
{
proprec = (PropertyRecord *)mallocMagic(sizeof(PropertyRecord));
plane = DBNewPlane((ClientData)TT_SPACE);
proprec->prop_value.prop_plane = plane;
} else {
proprec = (PropertyRecord *)mallocMagic(
sizeof(PropertyRecord) +
(proplen - 2) * sizeof(int));
}
proprec->prop_type = proptype;
proprec->prop_len = proplen;
}
proprec->prop_type = proptype;
proprec->prop_len = proplen;
/* Second pass */
value = cmd->tx_argv[argstart + 1];