Browse Source

PDF.js version 1.7.374 - See mozilla/pdf.js@cfc45e556c90bb2b1339dd0714a76bad5fb3f84c

pdfjsbot 8 years ago
parent
commit
2f3cf60e91
12 changed files with 75 additions and 27 deletions
  1. 1 1
      bower.json
  2. 23 7
      build/pdf.combined.js
  3. 6 6
      build/pdf.js
  4. 0 0
      build/pdf.min.js
  5. 19 3
      build/pdf.worker.js
  6. 0 0
      build/pdf.worker.min.js
  7. 17 1
      lib/core/jpg.js
  8. 2 2
      lib/display/api.js
  9. 2 2
      lib/display/global.js
  10. 2 2
      lib/pdf.js
  11. 2 2
      lib/pdf.worker.js
  12. 1 1
      package.json

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.7.372",
+  "version": "1.7.374",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"

+ 23 - 7
build/pdf.combined.js

@@ -20022,8 +20022,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
   }
  };
 }();
-exports.version = '1.7.372';
-exports.build = 'b2ed788e';
+exports.version = '1.7.374';
+exports.build = 'cfc45e55';
 exports.getDocument = getDocument;
 exports.PDFDataRangeTransport = PDFDataRangeTransport;
 exports.PDFWorker = PDFWorker;
@@ -38777,8 +38777,8 @@ if (!globalScope.PDFJS) {
  globalScope.PDFJS = {};
 }
 var PDFJS = globalScope.PDFJS;
-PDFJS.version = '1.7.372';
-PDFJS.build = 'b2ed788e';
+PDFJS.version = '1.7.374';
+PDFJS.build = 'cfc45e55';
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
  sharedUtil.setVerbosityLevel(PDFJS.verbosity);
@@ -47660,6 +47660,7 @@ exports.Jbig2Image = Jbig2Image;
 "use strict";
 
 var sharedUtil = __w_pdfjs_require__(0);
+var warn = sharedUtil.warn;
 var error = sharedUtil.error;
 var JpegImage = function JpegImageClosure() {
  var dctZigZag = new Uint8Array([
@@ -48200,8 +48201,23 @@ var JpegImage = function JpegImageClosure() {
     return value;
    }
    function readDataBlock() {
+    function isValidMarkerAt(pos) {
+     if (pos < data.length - 1) {
+      return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
+     }
+     return true;
+    }
     var length = readUint16();
-    var array = data.subarray(offset, offset + length - 2);
+    var endOffset = offset + length - 2;
+    if (!isValidMarkerAt(endOffset)) {
+     warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16'));
+     var pos = offset;
+     while (!isValidMarkerAt(pos)) {
+      pos++;
+     }
+     endOffset = pos;
+    }
+    var array = data.subarray(offset, endOffset);
     offset += array.length;
     return array;
    }
@@ -57887,8 +57903,8 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
 
 "use strict";
 
-var pdfjsVersion = '1.7.372';
-var pdfjsBuild = 'b2ed788e';
+var pdfjsVersion = '1.7.374';
+var pdfjsBuild = 'cfc45e55';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(26);
 var pdfjsDisplayAPI = __w_pdfjs_require__(10);

+ 6 - 6
build/pdf.js

@@ -3735,8 +3735,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
   }
  };
 }();
-exports.version = '1.7.372';
-exports.build = 'b2ed788e';
+exports.version = '1.7.374';
+exports.build = 'cfc45e55';
 exports.getDocument = getDocument;
 exports.PDFDataRangeTransport = PDFDataRangeTransport;
 exports.PDFWorker = PDFWorker;
@@ -5768,8 +5768,8 @@ if (!globalScope.PDFJS) {
  globalScope.PDFJS = {};
 }
 var PDFJS = globalScope.PDFJS;
-PDFJS.version = '1.7.372';
-PDFJS.build = 'b2ed788e';
+PDFJS.version = '1.7.374';
+PDFJS.build = 'cfc45e55';
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
  sharedUtil.setVerbosityLevel(PDFJS.verbosity);
@@ -9855,8 +9855,8 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
 
 "use strict";
 
-var pdfjsVersion = '1.7.372';
-var pdfjsBuild = 'b2ed788e';
+var pdfjsVersion = '1.7.374';
+var pdfjsBuild = 'cfc45e55';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
 var pdfjsDisplayAPI = __w_pdfjs_require__(3);

File diff suppressed because it is too large
+ 0 - 0
build/pdf.min.js


+ 19 - 3
build/pdf.worker.js

@@ -43896,6 +43896,7 @@ exports.Jbig2Image = Jbig2Image;
 "use strict";
 
 var sharedUtil = __w_pdfjs_require__(0);
+var warn = sharedUtil.warn;
 var error = sharedUtil.error;
 var JpegImage = function JpegImageClosure() {
  var dctZigZag = new Uint8Array([
@@ -44436,8 +44437,23 @@ var JpegImage = function JpegImageClosure() {
     return value;
    }
    function readDataBlock() {
+    function isValidMarkerAt(pos) {
+     if (pos < data.length - 1) {
+      return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
+     }
+     return true;
+    }
     var length = readUint16();
-    var array = data.subarray(offset, offset + length - 2);
+    var endOffset = offset + length - 2;
+    if (!isValidMarkerAt(endOffset)) {
+     warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16'));
+     var pos = offset;
+     while (!isValidMarkerAt(pos)) {
+      pos++;
+     }
+     endOffset = pos;
+    }
+    var array = data.subarray(offset, endOffset);
     offset += array.length;
     return array;
    }
@@ -51075,8 +51091,8 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
 
 "use strict";
 
-var pdfjsVersion = '1.7.372';
-var pdfjsBuild = 'b2ed788e';
+var pdfjsVersion = '1.7.374';
+var pdfjsBuild = 'cfc45e55';
 var pdfjsCoreWorker = __w_pdfjs_require__(8);
 {
  __w_pdfjs_require__(19);

File diff suppressed because it is too large
+ 0 - 0
build/pdf.worker.min.js


+ 17 - 1
lib/core/jpg.js

@@ -14,6 +14,7 @@
  */
 'use strict';
 var sharedUtil = require('../shared/util.js');
+var warn = sharedUtil.warn;
 var error = sharedUtil.error;
 var JpegImage = function JpegImageClosure() {
  var dctZigZag = new Uint8Array([
@@ -554,8 +555,23 @@ var JpegImage = function JpegImageClosure() {
     return value;
    }
    function readDataBlock() {
+    function isValidMarkerAt(pos) {
+     if (pos < data.length - 1) {
+      return data[pos] === 0xFF && data[pos + 1] >= 0xC0 && data[pos + 1] <= 0xFE;
+     }
+     return true;
+    }
     var length = readUint16();
-    var array = data.subarray(offset, offset + length - 2);
+    var endOffset = offset + length - 2;
+    if (!isValidMarkerAt(endOffset)) {
+     warn('readDataBlock - incorrect length, next marker is: ' + (data[endOffset] << 8 | data[endOffset + 1]).toString('16'));
+     var pos = offset;
+     while (!isValidMarkerAt(pos)) {
+      pos++;
+     }
+     endOffset = pos;
+    }
+    var array = data.subarray(offset, endOffset);
     offset += array.length;
     return array;
    }

+ 2 - 2
lib/display/api.js

@@ -1374,8 +1374,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
   }
  };
 }();
-exports.version = '1.7.372';
-exports.build = 'b2ed788e';
+exports.version = '1.7.374';
+exports.build = 'cfc45e55';
 exports.getDocument = getDocument;
 exports.PDFDataRangeTransport = PDFDataRangeTransport;
 exports.PDFWorker = PDFWorker;

+ 2 - 2
lib/display/global.js

@@ -30,8 +30,8 @@ if (!globalScope.PDFJS) {
  globalScope.PDFJS = {};
 }
 var PDFJS = globalScope.PDFJS;
-PDFJS.version = '1.7.372';
-PDFJS.build = 'b2ed788e';
+PDFJS.version = '1.7.374';
+PDFJS.build = 'cfc45e55';
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
  sharedUtil.setVerbosityLevel(PDFJS.verbosity);

+ 2 - 2
lib/pdf.js

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 'use strict';
-var pdfjsVersion = '1.7.372';
-var pdfjsBuild = 'b2ed788e';
+var pdfjsVersion = '1.7.374';
+var pdfjsBuild = 'cfc45e55';
 var pdfjsSharedUtil = require('./shared/util.js');
 var pdfjsDisplayGlobal = require('./display/global.js');
 var pdfjsDisplayAPI = require('./display/api.js');

+ 2 - 2
lib/pdf.worker.js

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 'use strict';
-var pdfjsVersion = '1.7.372';
-var pdfjsBuild = 'b2ed788e';
+var pdfjsVersion = '1.7.374';
+var pdfjsBuild = 'cfc45e55';
 var pdfjsCoreWorker = require('./core/worker.js');
 {
  require('./core/network.js');

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.7.372",
+  "version": "1.7.374",
   "main": "build/pdf.js",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [

Some files were not shown because too many files changed in this diff