Skip to content

CST1229/zip: don't use regex for data validation #2440

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
CubesterYT merged 2 commits into from
Mar 18, 2026
Merged

CST1229/zip: don't use regex for data validation #2440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44b87d
CST1229/zip: don't use regex for data validation
LegoBrainBiker Mar 18, 2026
bc35d81
[Automated] Format code
DangoCat Mar 18, 2026
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
20 changes: 16 additions & 4 deletions extensions/CST1229/zip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,17 @@
}
return arr;
}
isStringValid(string, partLength, validchars) {
if (string.length % partLength !== 0) {
return false;
}
for (let i = 0; i < string.length; i++) {
if (!validchars.includes(string[i])) {
return false;
}
}
return true;
}
// get a file/folder by path
getObj(path, zip = this.zip) {
// JSZip.prototype.files seems to be a null-prototype object
Expand Down Expand Up @@ -752,14 +763,14 @@
break;
case "hex":
{
if (!/^(?:[0-9A-F]{2})*$/i.test(DATA)) return;
if (!this.isStringValid(DATA, 2, "0123456789ABCDEF")) return;
const dataArr = this.splitIntoParts(DATA, 2);
DATA = Uint8Array.from(dataArr.map((o) => parseInt(o, 16)));
}
break;
case "binary":
{
if (!/^(?:[01]{8})*$/i.test(DATA)) return;
if (!this.isStringValid(DATA, 8, "01")) return;
const dataArr = this.splitIntoParts(DATA, 8);
DATA = Uint8Array.from(dataArr.map((o) => parseInt(o, 2)));
}
Expand Down Expand Up @@ -969,7 +980,8 @@
break;
case "hex":
{
if (!/^(?:[0-9A-F]{2})*$/i.test(CONTENT)) return "";
if (!this.isStringValid(CONTENT, 2, "0123456789ABCDEF"))
return "";
const dataArr = this.splitIntoParts(CONTENT, 2);
const data = Uint8Array.from(dataArr.map((o) => parseInt(o, 16)));
this.zips[this.zip].file(path, data, {
Expand All @@ -979,7 +991,7 @@
break;
case "binary":
{
if (!/^(?:[01]{8})*$/i.test(CONTENT)) return "";
if (!this.isStringValid(CONTENT, 8, "01")) return "";
const dataArr = this.splitIntoParts(CONTENT, 8);
const data = Uint8Array.from(dataArr.map((o) => parseInt(o, 2)));
this.zips[this.zip].file(path, data, {
Expand Down
Loading