tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-28 00:06:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Gopher client filename length crash.

Browse source
This commit is contained in:
TomAwezome 2021-11-05 05:35:02 -04:00
parent ffd0e6acfc
commit 8a4fb38873
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Home/Net/Programs/Gopher.CC
View file

@ -46,15 +46,13 @@ I64 GopherOpen(U8 *host, U16 port, U8 *selector, U8 *query)
return sock; return sock;
} }
#define GOPHER_BUFF_SIZE BLK_SIZE * 64
public I64 GopherDl(U8 *host, U16 port = 70, U8 *selector, U8 *query = NULL, U8 *dest) public I64 GopherDl(U8 *host, U16 port = 70, U8 *selector, U8 *query = NULL, U8 *dest)
{ {
CFile *f; CFile *f;
U8 buf[BLK_SIZE]; U8 buf[BLK_SIZE];
// U8 buf[GOPHER_BUFF_SIZE];
I64 data_len = 0, total_len = 0, got, sock; I64 data_len = 0, total_len = 0, got, sock;
progress4 = 0;
f = FOpen(dest, "w"); f = FOpen(dest, "w");
if (!f) if (!f)
{ {
@ -74,8 +72,9 @@ public I64 GopherDl(U8 *host, U16 port = 70, U8 *selector, U8 *query = NULL, U8
got = TCPSocketReceive(sock, buf + data_len, sizeof(buf) - data_len); got = TCPSocketReceive(sock, buf + data_len, sizeof(buf) - data_len);
if (got <= 0) if (got <= 0)
{ {
if (got < 0)
PrintErr("Failed to receive TCP data\n");
if (data_len != 0 && !FBlkWrite(f, buf)) if (data_len != 0 && !FBlkWrite(f, buf))
// if (data_len != 0 && !FBlkWrite(f, buf,, GOPHER_BUFF_SIZE))
{ {
break; break;
} }
@ -85,11 +84,10 @@ public I64 GopherDl(U8 *host, U16 port = 70, U8 *selector, U8 *query = NULL, U8
} }
data_len += got; data_len += got;
total_len += got; total_len += got;
progress4 += got;
if (data_len == BLK_SIZE) if (data_len == BLK_SIZE)
// if (data_len == GOPHER_BUFF_SIZE)
{ {
if (!FBlkWrite(f, buf)) if (!FBlkWrite(f, buf))
// if (!FBlkWrite(f, buf,, GOPHER_BUFF_SIZE))
{ {
break; break;
} }
@ -139,13 +137,21 @@ U8 *GopherBasename(U8 *selector)
result = lastslash + 1; result = lastslash + 1;
} }
//BAD FOR FILENAMES: ? / | = % //BAD FOR FILENAMES: ? / | = % : ; * + " < > space
result = StrReplace(result, "?", ""); result = StrReplace(result, "?", "");
result = StrReplace(result, "/", "",, TRUE); result = StrReplace(result, "/", "",, TRUE);
result = StrReplace(result, "|", "",, TRUE); result = StrReplace(result, "|", "",, TRUE);
result = StrReplace(result, "=", "",, TRUE); result = StrReplace(result, "=", "",, TRUE);
result = StrReplace(result, "%", "",, TRUE); result = StrReplace(result, "%", "",, TRUE);
// result = StrNew("TEST.TXT"); result = StrReplace(result, ":", "",, TRUE);
result = StrReplace(result, ";", "",, TRUE);
result = StrReplace(result, "*", "",, TRUE);
result = StrReplace(result, "+", "",, TRUE);
result = StrReplace(result, "\"", "",, TRUE);
result = StrReplace(result, "<", "",, TRUE);
result = StrReplace(result, ">", "",, TRUE);
result = StrReplace(result, " ", "",, TRUE);
SysLog("%s\n", result); SysLog("%s\n", result);
return result; return result;
@ -158,12 +164,17 @@ U0 GopherTextView(U8 *host, U16 port, U8 *selector)
DirMake("::/Tmp/Gopher"); DirMake("::/Tmp/Gopher");
basename = ExtChange(GopherBasename(selector), "TXT"); tmpname = StrNew(selector);
if (StrLen(tmpname) > 22)
tmpname[21] = 0; // too long, terminate it early
basename = ExtChange(GopherBasename(tmpname), "TXT");
Free(tmpname);
tmpname = StrPrint(NULL, "::/Tmp/Gopher/%s", basename); tmpname = StrPrint(NULL, "::/Tmp/Gopher/%s", basename);
Free(basename); Free(basename);
if (GopherDl(host, port, selector, , tmpname) == 0) if (GopherDl(host, port, selector,, tmpname) == 0)
{ {
SysLog("%s\n", tmpname);
Plain(tmpname); Plain(tmpname);
} }
else else
@ -295,13 +306,15 @@ U0 GopherDlPrompt(U8 *host, U16 port, U8 *selector)
U8 *basename; U8 *basename;
basename = GopherBasename(selector); basename = GopherBasename(selector);
MemSet(form.name, 0, 256); MemSet(form.name, 0, 256);
MemCopy(form.name, basename, MemCopy(form.name, basename,
MinI64(StrLen(basename), sizeof(form.name) - 1)); MinI64(StrLen(basename), sizeof(form.name) - 1));
form.name[255] = 0; form.name[255] = 0;
if (PopUpForm(&form)) if (PopUpForm(&form))
{ {
GopherDl(host, port, selector, , form.name); if (StrLen(form.name) >= 26)
form.name[25] = 0;
GopherDl(host, port, selector,, form.name);
} }
} }