Skip to content

Commit fb957f5

Browse files
author
biggert
committed
Prevent undefined error on null object when calling .destroy on a
document initialized with LocalPdfManager. Per @brendandahl's recommendation, moved the terminate function out of worker and into the PdfManager
1 parent 1bcb3ef commit fb957f5

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/core/pdf_manager.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ var BasePdfManager = (function BasePdfManagerClosure() {
6363
if (this.passwordChangedPromise) {
6464
this.passwordChangedPromise.resolve();
6565
}
66+
},
67+
68+
terminate: function BasePdfManager_terminate() {
69+
return new NotImplementedException();
6670
}
6771
};
6872

@@ -115,6 +119,11 @@ var LocalPdfManager = (function LocalPdfManagerClosure() {
115119
return this.loadedStream;
116120
};
117121

122+
LocalPdfManager.prototype.terminate =
123+
function LocalPdfManager_terminate() {
124+
return;
125+
};
126+
118127
return LocalPdfManager;
119128
})();
120129

@@ -192,6 +201,11 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() {
192201
return this.streamManager.onLoadedStream();
193202
};
194203

204+
NetworkPdfManager.prototype.terminate =
205+
function NetworkPdfManager_terminate() {
206+
this.streamManager.networkManager.abortAllRequests();
207+
};
208+
195209
return NetworkPdfManager;
196210
})();
197211

src/core/worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
368368
});
369369

370370
handler.on('Terminate', function wphTerminate(data, promise) {
371-
pdfManager.streamManager.networkManager.abortAllRequests();
371+
pdfManager.terminate();
372372
promise.resolve();
373373
});
374374
}

0 commit comments

Comments
 (0)