Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit e599b94

Browse files
Archkonaduh95
authored andcommitted
zlib: validate pledgedSrcSize as a safe integer
pledgedSrcSize represents an exact byte count. Reject values that are not non-negative safe integers instead of silently ignoring or coercing them through IntegerValue(). Apply the same validation to zlib/iter and retain a native validation check for internal callers. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64604Fixes: #64603 Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Jan Martin <jan.krems@gmail.com>
1 parent f24177c commit e599b94

6 files changed

Lines changed: 65 additions & 26 deletions

File tree

β€Ždoc/api/zlib.mdβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,9 @@ const stream = zlib.createZstdCompress({
784784
#### Pledged Source Size
785785

786786
It's possible to specify the expected total size of the uncompressed input via
787-
`opts.pledgedSrcSize`. If the size doesn't match at the end of the input,
788-
compression will fail with the code `ZSTD_error_srcSize_wrong`.
787+
`opts.pledgedSrcSize`, which must be a non-negative safe integer. If the size
788+
doesn't match at the end of the input, compression will fail with the code
789+
`ZSTD_error_srcSize_wrong`.
789790

790791
#### Decompressor options
791792

@@ -1927,7 +1928,8 @@ added: v25.9.0
19271928
`ZSTD_btultra2`.
19281929
See the [Zstd compressor options][] in the zlib documentation for the
19291930
full list.
1930-
*`pledgedSrcSize` {number} Expected uncompressed size (optional hint).
1931+
*`pledgedSrcSize` {number} Expected uncompressed size as a non-negative safe
1932+
integer (optional hint).
19311933
*`dictionary` {Buffer|TypedArray|DataView}
19321934
* Returns: {Object} A stateful transform.
19331935

β€Žlib/internal/streams/iter/transform.jsβ€Ž

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ function createZstdHandle(mode, options, processCallback, onError) {
257257
validateParams(options.params,maxParam,ERR_ZSTD_INVALID_PARAM);
258258

259259
constpledgedSrcSize=options.pledgedSrcSize;
260-
if(pledgedSrcSize!==undefined){
261-
if(typeofpledgedSrcSize!=='number'||NumberIsNaN(pledgedSrcSize)){
262-
thrownewERR_INVALID_ARG_TYPE('options.pledgedSrcSize','number',
263-
pledgedSrcSize);
264-
}
265-
if(pledgedSrcSize<0){
266-
thrownewERR_OUT_OF_RANGE('options.pledgedSrcSize','>= 0',
267-
pledgedSrcSize);
268-
}
269-
}
270260

271261
consthandle=isCompress ?
272262
newbinding.ZstdCompress() : newbinding.ZstdDecompress();

β€Žlib/zlib.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Zstd extends ZlibBase {
939939
consthandle=mode===ZSTD_COMPRESS ?
940940
newbinding.ZstdCompress() : newbinding.ZstdDecompress();
941941

942-
constpledgedSrcSize=opts?.pledgedSrcSize??undefined;
942+
constpledgedSrcSize=opts?.pledgedSrcSize;
943943

944944
constwriteState=newUint32Array(2);
945945

β€Žsrc/node_zlib.ccβ€Ž

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,6 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
945945
}
946946

947947
staticvoidInit(const FunctionCallbackInfo<Value>& args) {
948-
Environment* env = Environment::GetCurrent(args);
949-
Local<Context> context = env->context();
950-
951948
CHECK((args.Length() == 4 || args.Length() == 5) &&
952949
"init(params, pledgedSrcSize, writeResult, writeCallback[, "
953950
"dictionary])");
@@ -964,19 +961,24 @@ class ZstdStream final : public CompressionStream<CompressionContext> {
964961
wrap->InitStream(write_result, write_js_callback);
965962

966963
uint64_t pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
967-
if (args[1]->IsNumber()) {
968-
int64_t signed_pledged_src_size;
969-
if (!args[1]->IntegerValue(context).To(&signed_pledged_src_size)) {
970-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
971-
"pledgedSrcSize should be an integer");
964+
if (!args[1]->IsUndefined()) {
965+
if (!args[1]->IsNumber()) {
966+
THROW_ERR_INVALID_ARG_TYPE(wrap->env(),
967+
"pledgedSrcSize must be a number");
968+
return;
969+
}
970+
if (!IsSafeJsInt(args[1])) {
971+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
972+
"pledgedSrcSize must be a safe integer");
972973
return;
973974
}
975+
constint64_t signed_pledged_src_size = args[1].As<Integer>()->Value();
974976
if (signed_pledged_src_size < 0) {
975-
THROW_ERR_INVALID_ARG_VALUE(wrap->env(),
976-
"pledgedSrcSize may not be negative");
977+
THROW_ERR_OUT_OF_RANGE(wrap->env(),
978+
"pledgedSrcSize must be non-negative");
977979
return;
978980
}
979-
pledged_src_size = signed_pledged_src_size;
981+
pledged_src_size = static_cast<uint64_t>(signed_pledged_src_size);
980982
}
981983

982984
AllocScope alloc_scope(wrap);

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,16 @@ async function testAsyncValidation() {
353353

354354
// Zstd pledgedSrcSize
355355
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: 'bad'})),TYPE);
356-
awaitassert.rejects(consume(compressZstd({pledgedSrcSize: -1})),RANGE);
356+
for(constpledgedSrcSizeof[
357+
NaN,
358+
Infinity,
359+
-Infinity,
360+
1.9,
361+
-1,
362+
Number.MAX_SAFE_INTEGER+1,
363+
]){
364+
awaitassert.rejects(consume(compressZstd({ pledgedSrcSize })),RANGE);
365+
}
357366
}
358367

359368
// =============================================================================

β€Žtest/parallel/test-zlib-zstd-pledged-src-size.jsβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,39 @@ compressWithPledgedSrcSize({ pledgedSrcSize: 42, actualSrcSize: 0 });
3535
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 13});
3636

3737
compressWithPledgedSrcSize({pledgedSrcSize: 42,actualSrcSize: 42});
38+
39+
functionassertInvalidPledgedSrcSize(pledgedSrcSize,expected){
40+
assert.throws(
41+
()=>zlib.createZstdCompress({ pledgedSrcSize }),
42+
expected,
43+
);
44+
assert.throws(
45+
()=>zlib.zstdCompressSync('',{ pledgedSrcSize }),
46+
expected,
47+
);
48+
}
49+
50+
for(constpledgedSrcSizeof['1',null]){
51+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
52+
name: 'TypeError',
53+
code: 'ERR_INVALID_ARG_TYPE',
54+
});
55+
}
56+
57+
for(constpledgedSrcSizeof[
58+
NaN,
59+
Infinity,
60+
-Infinity,
61+
1.9,
62+
-1,
63+
Number.MAX_SAFE_INTEGER+1,
64+
]){
65+
assertInvalidPledgedSrcSize(pledgedSrcSize,{
66+
name: 'RangeError',
67+
code: 'ERR_OUT_OF_RANGE',
68+
});
69+
}
70+
71+
zlib.createZstdCompress({
72+
pledgedSrcSize: Number.MAX_SAFE_INTEGER,
73+
}).destroy();

0 commit comments

Comments
Β (0)