Skip to content

Fix strcat on overlapping strings #1235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2025
Merged

Fix strcat on overlapping strings #1235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/mad_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "madx.h"

#include <stdio.h>
#ifndef _WIN32
#include <sys/utsname.h> // for uname
#endif
Expand Down Expand Up @@ -702,6 +702,8 @@ table_value(void)
double val = zero;
int ntok, col, row;
char** toks;
char *tmp_row_name;
unsigned l_tmp_row_name;
struct table* table;
char temp[NAME_L];

Expand All @@ -720,17 +722,16 @@ table_value(void)
{
if (ntok > 2)
{ /* find row - else current (dynamic), or 0 */
/* start mod - HG 26.3.2011 */
if (ntok > 5)
if (ntok > 5 && *toks[2] == '[' && *toks[4] == ']')
{ /* check for [ count ] and convert to ->count */
if (*toks[2] == '[' && *toks[4] == ']')
{
strcat(toks[1], "->");
strcat(toks[1], toks[3]);
}
l_tmp_row_name = strlen(toks[1])+strlen(toks[3])+3;
tmp_row_name = malloc(l_tmp_row_name);
snprintf(tmp_row_name,l_tmp_row_name,"%s->%s",toks[1],toks[3]);
row = table_row(table, tmp_row_name);
free(tmp_row_name);
}
/* end mod - HG 26.3.2011 */
row = table_row(table, toks[1]);
else
row = table_row(table, toks[1]);
}
else
{
Expand Down
Loading