From 4e8fbeae2228472b7dfa57799a1d8eaa6cdb0cfc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Sep 2014 23:26:45 +0530
Subject: [PATCH] E-book viewer: Fix a rare hang caused by an infinite loop
 when decoding a CFI

---
 resources/compiled_coffeescript.zip       | Bin 93276 -> 93320 bytes
 src/calibre/ebooks/oeb/display/cfi.coffee |   1 +
 2 files changed, 1 insertion(+)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 8547c11ebe6666052303a33902e138f031a9fae4..615531f2330473a52a0dd69ac5789c5a5433c38d 100644
GIT binary patch
delta 314
zcmca}gSF!(t8{=jGm8iV2pH~GbKSnK{2yx~0|N+4PF^@eY`Q}>BilyvFPf7*^i(JR
z(c+l=&q!&ruht>6%>s!H=6oM^s<|q3ynMu!!oa|lGWp>j$<5nmY(C3}YS{FOG{$g7
zo9P$Q7`>P*vZr56V-%fio6R@fKAlmEslOB~Fuft2(Uj?YH-vL0ol#64)pQ01X|O|K
z#HQ(t8H^rGU;jXKBxEoeF+QF?87Ri+G5t;kqYv|WO~&a5G#O>5dt@>SaCD_HGW=tz
zR+`*cD!08Zlkp6rPLi>OX`-o-xlyWxk(o)dX`+##Nm`<1nz^}|QL3Rql8Je$xly8F
Tl9G;s(&U5PvePGLGoAzhxsqoa

delta 306
zcmeCU$$IAot8{=jGm8iV2oxmvxTv3zjl7w_zyQLMlLh{YZ8ZF)Ia%9SX>*m<A+yPS
zrTm+{5{t~4@>Xu%H{-@xK2$x^m!vU<GYKS47W^wZIX97Ox=cEw786f4h(A3xoza3R
zxfCpSpp<+1c97iSZV-P`4;Np6HzSh>GsGo%E2j%&Fv>8s%>e7P%VOl1?wtWte)11c
zKz8~RAe(Xf^!*u(9!xS4(+^}YicFWyWHe`5tO?=#*JR|HUXsZuz#f;z$ncM;diug_
zMv=)tYqzh;WIV&DVQFD*X=G-QXlQ0(n4D~w2IQrhn<gfjnxq-0S*9i%8yKf0n;Iof
Q-=D=O4s_o1{n?Bs0U!Wn>;M1&

diff --git a/src/calibre/ebooks/oeb/display/cfi.coffee b/src/calibre/ebooks/oeb/display/cfi.coffee
index a3a08cb67d..8c22d2f641 100644
--- a/src/calibre/ebooks/oeb/display/cfi.coffee
+++ b/src/calibre/ebooks/oeb/display/cfi.coffee
@@ -279,6 +279,7 @@ class CanonicalFragmentIdentifier
                                 node = child
                         if not child
                             error = "No matching child found for CFI: " + cfi
+                        cfi = cfi.substr(r[0].length)
                         break
                     index |= 1 # Increment index by 1 if it is even
                     if child.nodeType == 1