Commit 1aafd19

Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted the new entry into memory before the final directory rewrite. If that rewrite failed (ENOSPC/EIO after the member bytes were already written), the in-memory state and the on-disk archive were left diverged and half-updated, with no restore, corrupting the next add(). Wrap the rewrite: on failure, restore the previous offset and directory entry and rewrite the original directory back, leaving the archive and handle exactly as before the call, then rethrow. Signed-off-by: Philipp Dunkel <pip@pipobscure.com> PR-URL: #65016 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19

1 file changed

Lines changed: 46 additions & 6 deletions

File tree

‎lib/internal/zip/file.js‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}

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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
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 1aafd19
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
zlib: roll back a failed add() directory rewrite
add()/addEntrySync() advanced the central-directory offset and adopted
the new entry into memory before the final directory rewrite. If that
rewrite failed (ENOSPC/EIO after the member bytes were already written),
the in-memory state and the on-disk archive were left diverged and
half-updated, with no restore, corrupting the next add().
Wrap the rewrite: on failure, restore the previous offset and directory
entry and rewrite the original directory back, leaving the archive and
handle exactly as before the call, then rethrow.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent d29cc09 commit 1aafd19
1 file changed
Lines changed: 46 additions & 6 deletions
File tree
‎lib/internal/zip/file.js‎
Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,11 @@ class ZipFile {
387387
returnthis.#enqueue(async()=>
388388
this.#doAdd(awaitZipEntry.create(filename,data,options)));
389389
}
390-
// Append the entry's bytes where the central directory currently starts,
391-
// then rewrite the directory to include it. On write failure, restore the
392-
// original directory (the partial write may have clobbered it) and rethrow;
393-
// on success, promote a spent stream entry to its on-disk copy.
390+
// Append the entry's bytes where the central directory currently starts, then
391+
// rewrite the directory to include it. If the member write or the directory
392+
// rewrite fails, restore the original directory and drop the half-adopted
393+
// entry so the archive is left exactly as it was, then rethrow; on success,
394+
// promote a spent stream entry to its on-disk copy.
394395
async #doAdd(entry){
395396
constlocalOffset=this.#centralDirectoryOffset;
396397
letwritten=0;
@@ -413,9 +414,30 @@ class ZipFile {
413414
}
414415
throwerr;
415416
}
417+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
416418
this.#centralDirectoryOffset =localOffset+written;
417419
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
418-
awaitthis.#rewriteCentralDirectory();
420+
try{
421+
awaitthis.#rewriteCentralDirectory();
422+
}catch(err){
423+
// The directory rewrite failed after the member bytes landed. Undo the
424+
// in-memory adoption and rewrite the original directory back at its old
425+
// offset (where the failed member bytes started), leaving the archive and
426+
// this handle exactly as before the call.
427+
this.#centralDirectoryOffset =localOffset;
428+
if(previousEntry===undefined){
429+
MapPrototypeDelete(this.#entries,entry.name);
430+
}else{
431+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
432+
}
433+
try{
434+
awaitthis.#rewriteCentralDirectory();
435+
}catch{
436+
// Restoring failed too (the device is likely full or gone); the
437+
// original error is the actionable one.
438+
}
439+
throwerr;
440+
}
419441
// The entry now has a stable home in this archive; if it was a spent
420442
// streaming entry, rebind it to that on-disk copy so it stays readable.
421443
entry[kPromote](this.#handle,localOffset);
@@ -453,9 +475,27 @@ class ZipFile {
453475
}
454476
throwerr;
455477
}
478+
constpreviousEntry=MapPrototypeGet(this.#entries,entry.name);
456479
this.#centralDirectoryOffset =localOffset+written;
457480
MapPrototypeSet(this.#entries,entry.name,{central: null, entry, localOffset });
458-
this.#rewriteCentralDirectorySync();
481+
try{
482+
this.#rewriteCentralDirectorySync();
483+
}catch(err){
484+
// See #doAdd(): undo the in-memory adoption and restore the original
485+
// directory so a failed rewrite leaves the archive exactly as it was.
486+
this.#centralDirectoryOffset =localOffset;
487+
if(previousEntry===undefined){
488+
MapPrototypeDelete(this.#entries,entry.name);
489+
}else{
490+
MapPrototypeSet(this.#entries,entry.name,previousEntry);
491+
}
492+
try{
493+
this.#rewriteCentralDirectorySync();
494+
}catch{
495+
// Restoring failed too; the original error is the actionable one.
496+
}
497+
throwerr;
498+
}
459499
entry[kPromote](this.#handle,localOffset);
460500
returnentry;
461501
}
0 commit comments
Comments
 (0)