jenkins-bot has submitted this change and it was merged.
Change subject: mw.UploadWizardUpload: Improve error handling in
#extractMetadataFromJpegMeta
......................................................................
mw.UploadWizardUpload: Improve error handling in #extractMetadataFromJpegMeta
* Handle 'error' events on FileReader.
* Handle null result in 'load' events.
* Remove debugging code from f714050b.
Bug: T136235
Change-Id: I7413a7d57d57af0a189e96f530e4e926f2bcbcbc
---
M resources/mw.UploadWizardUpload.js
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.UploadWizardUpload.js
b/resources/mw.UploadWizardUpload.js
index a3f1728..315c0c9 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -521,21 +521,21 @@
upload = this;
if ( this.file && this.file.type === 'image/jpeg' ) {
binReader = new FileReader();
+ binReader.onerror = function () {
+ deferred.resolve();
+ };
binReader.onload = function () {
var binStr, arr, i, meta;
+ if ( binReader.result === null ) {
+ // Contrary to documentation, this
sometimes fires for unsuccessful loads (T136235)
+ deferred.resolve();
+ return;
+ }
if ( typeof binReader.result === 'string' ) {
binStr = binReader.result;
} else {
// Array buffer; convert to binary
string for the library.
- try {
- arr = new Uint8Array(
binReader.result );
- } catch ( err ) {
- throw new Error(
- err.message +
- ' result=' + String(
binReader.result ) +
- ' error=' + String(
binReader.error )
- );
- }
+ arr = new Uint8Array( binReader.result
);
binStr = '';
for ( i = 0; i < arr.byteLength; i++ ) {
binStr += String.fromCharCode(
arr[ i ] );
--
To view, visit https://gerrit.wikimedia.org/r/299734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7413a7d57d57af0a189e96f530e4e926f2bcbcbc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
