some more boundary checking
This commit is contained in:
parent
3c62c2be5a
commit
cd54f56b36
|
@ -90,7 +90,7 @@ LoadJPG(char *origname, byte **pic, int *width, int *height)
|
||||||
|
|
||||||
/* Add the extension */
|
/* Add the extension */
|
||||||
len = strlen(filename);
|
len = strlen(filename);
|
||||||
if (strcmp(filename + len - 4, ".jpg"))
|
if (len >= 4 && strcmp(filename + len - 4, ".jpg"))
|
||||||
{
|
{
|
||||||
strncat(filename, ".jpg", sizeof(filename) - 1 - len);
|
strncat(filename, ".jpg", sizeof(filename) - 1 - len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,8 +42,8 @@ LoadPCX(char *origname, byte **pic, byte **palette, int *width, int *height)
|
||||||
filename[sizeof(filename) - 1] = '\0';
|
filename[sizeof(filename) - 1] = '\0';
|
||||||
|
|
||||||
/* Add the extension */
|
/* Add the extension */
|
||||||
filelen = strlen(origname);
|
filelen = strlen(filename);
|
||||||
if (strcmp(filename + filelen - 4, ".pcx"))
|
if (filelen >= 4 && strcmp(filename + filelen - 4, ".pcx"))
|
||||||
{
|
{
|
||||||
strncat(filename, ".pcx", sizeof(filename) - 1 - filelen);
|
strncat(filename, ".pcx", sizeof(filename) - 1 - filelen);
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,8 +54,8 @@ LoadTGA(char *origname, byte **pic, int *width, int *height)
|
||||||
name[sizeof(name) - 1] = '\0';
|
name[sizeof(name) - 1] = '\0';
|
||||||
|
|
||||||
/* Add the extension */
|
/* Add the extension */
|
||||||
len = strlen(origname);
|
len = strlen(name);
|
||||||
if (strcmp(name + len - 4, ".tga"))
|
if (len >= 4 && strcmp(name + len - 4, ".tga"))
|
||||||
{
|
{
|
||||||
strncat(name, ".tga", sizeof(name) - 1 - len);
|
strncat(name, ".tga", sizeof(name) - 1 - len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ LoadWal(char *origname)
|
||||||
|
|
||||||
/* Add the extension */
|
/* Add the extension */
|
||||||
len = strlen(name);
|
len = strlen(name);
|
||||||
if (strcmp(name + len - 4, ".wal"))
|
if (len >= 4 && strcmp(name + len - 4, ".wal"))
|
||||||
{
|
{
|
||||||
strncat(name, ".wal", sizeof(name) - 1 - len);
|
strncat(name, ".wal", sizeof(name) - 1 - len);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue