Fossil SCM
Fix a null deref which would trigger if the XHR to fetch a forum post fails.
Commit
8da3b3f796f88d92bdfbcaa9e333ae57e4a8a727ba98d96157c0cc64be1b39c0
Parent
86dc0502db82ba0…
1 file changed
+2
-2
+2
-2
| --- src/fossil.page.forumpost.js | ||
| +++ src/fossil.page.forumpost.js | ||
| @@ -1099,11 +1099,11 @@ | ||
| 1099 | 1099 | } |
| 1100 | 1100 | if( eButton.dataset.originalLabel ){ |
| 1101 | 1101 | eButton.innerText = eButton.dataset.originalLabel; |
| 1102 | 1102 | delete eButton.dataset.originalLabel; |
| 1103 | 1103 | } |
| 1104 | - for(const ee of (fpe.eUnhideThenWhenDone || [])){ | |
| 1104 | + for(const ee of (fpe?.eUnhideThenWhenDone || [])){ | |
| 1105 | 1105 | ee.removeAttribute('hidden'); |
| 1106 | 1106 | } |
| 1107 | 1107 | }; |
| 1108 | 1108 | |
| 1109 | 1109 | /** |
| @@ -1286,11 +1286,11 @@ | ||
| 1286 | 1286 | .catch(err=>{ |
| 1287 | 1287 | if( releaseLock ){ |
| 1288 | 1288 | releaseLock(); |
| 1289 | 1289 | releaseLock = null; |
| 1290 | 1290 | } |
| 1291 | - restoreEditReplyElement(ePost, eBtnEdit); | |
| 1291 | + restoreEditReplyElement(ePost, eBtnEdit, null); | |
| 1292 | 1292 | console.error("Error fetching post:", err); |
| 1293 | 1293 | reportFPEError(ePost, "Error fetching post: ", err.message); |
| 1294 | 1294 | }); |
| 1295 | 1295 | }/*editClicked()*/; |
| 1296 | 1296 | |
| 1297 | 1297 |
| --- src/fossil.page.forumpost.js | |
| +++ src/fossil.page.forumpost.js | |
| @@ -1099,11 +1099,11 @@ | |
| 1099 | } |
| 1100 | if( eButton.dataset.originalLabel ){ |
| 1101 | eButton.innerText = eButton.dataset.originalLabel; |
| 1102 | delete eButton.dataset.originalLabel; |
| 1103 | } |
| 1104 | for(const ee of (fpe.eUnhideThenWhenDone || [])){ |
| 1105 | ee.removeAttribute('hidden'); |
| 1106 | } |
| 1107 | }; |
| 1108 | |
| 1109 | /** |
| @@ -1286,11 +1286,11 @@ | |
| 1286 | .catch(err=>{ |
| 1287 | if( releaseLock ){ |
| 1288 | releaseLock(); |
| 1289 | releaseLock = null; |
| 1290 | } |
| 1291 | restoreEditReplyElement(ePost, eBtnEdit); |
| 1292 | console.error("Error fetching post:", err); |
| 1293 | reportFPEError(ePost, "Error fetching post: ", err.message); |
| 1294 | }); |
| 1295 | }/*editClicked()*/; |
| 1296 | |
| 1297 |
| --- src/fossil.page.forumpost.js | |
| +++ src/fossil.page.forumpost.js | |
| @@ -1099,11 +1099,11 @@ | |
| 1099 | } |
| 1100 | if( eButton.dataset.originalLabel ){ |
| 1101 | eButton.innerText = eButton.dataset.originalLabel; |
| 1102 | delete eButton.dataset.originalLabel; |
| 1103 | } |
| 1104 | for(const ee of (fpe?.eUnhideThenWhenDone || [])){ |
| 1105 | ee.removeAttribute('hidden'); |
| 1106 | } |
| 1107 | }; |
| 1108 | |
| 1109 | /** |
| @@ -1286,11 +1286,11 @@ | |
| 1286 | .catch(err=>{ |
| 1287 | if( releaseLock ){ |
| 1288 | releaseLock(); |
| 1289 | releaseLock = null; |
| 1290 | } |
| 1291 | restoreEditReplyElement(ePost, eBtnEdit, null); |
| 1292 | console.error("Error fetching post:", err); |
| 1293 | reportFPEError(ePost, "Error fetching post: ", err.message); |
| 1294 | }); |
| 1295 | }/*editClicked()*/; |
| 1296 | |
| 1297 |