From 28106728295b80c7d9724be324865b53d0441b74 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Mon, 9 Nov 2015 19:43:10 +0000
Subject: [PATCH] PDF.js version 1.2.85 - See
 mozilla/pdf.js@5b2015b04b58e69628f4cd9ee4252a45217bacce

---
 bower.json            |  2 +-
 build/pdf.combined.js | 13 +++++++++++--
 build/pdf.js          |  4 ++--
 build/pdf.worker.js   | 13 +++++++++++--
 package.json          |  2 +-
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index 485a979ca..6da260a5f 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.83",
+  "version": "1.2.85",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index c22fb4d5f..500ebb336 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.83';
-PDFJS.build = '1280b7b';
+PDFJS.version = '1.2.85';
+PDFJS.build = '5b2015b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -24417,6 +24417,15 @@ var Font = (function FontClosure() {
        * PDF spec
        */
       function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) {
+        if (!cmap) {
+          warn('No cmap table available.');
+          return {
+            platformId: -1,
+            encodingId: -1,
+            mappings: [],
+            hasShortCmap: false
+          };
+        }
         var segment;
         var start = (font.start ? font.start : 0) + cmap.offset;
         font.pos = start;
diff --git a/build/pdf.js b/build/pdf.js
index 39d4815ee..d3ff42bc8 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.83';
-PDFJS.build = '1280b7b';
+PDFJS.version = '1.2.85';
+PDFJS.build = '5b2015b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 06663faa3..3ebb74b6e 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.83';
-PDFJS.build = '1280b7b';
+PDFJS.version = '1.2.85';
+PDFJS.build = '5b2015b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -17837,6 +17837,15 @@ var Font = (function FontClosure() {
        * PDF spec
        */
       function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) {
+        if (!cmap) {
+          warn('No cmap table available.');
+          return {
+            platformId: -1,
+            encodingId: -1,
+            mappings: [],
+            hasShortCmap: false
+          };
+        }
         var segment;
         var start = (font.start ? font.start : 0) + cmap.offset;
         font.pos = start;
diff --git a/package.json b/package.json
index 20cbb31b1..6b920f1c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.83",
+  "version": "1.2.85",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",