[Pkg-javascript-commits] [pdf.js] 95/161: Merge pull request #4493 from yurydelendik/issue4491
David Prévot
taffit at moszumanska.debian.org
Sat Apr 19 14:16:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 1416eca164f5ae0f0e4d1e51da515e5907dcc458
Merge: 5720500 20a91bc
Author: Brendan Dahl <brendan.dahl at gmail.com>
Date: Thu Mar 20 14:57:24 2014 -0700
Merge pull request #4493 from yurydelendik/issue4491
Fixes ignoring of the escaped CR LF
src/core/parser.js | 7 ++++++-
test/unit/parser_spec.js | 11 +++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --cc src/core/parser.js
index c86dcba,205a34c..aff4608
--- a/src/core/parser.js
+++ b/src/core/parser.js
@@@ -593,9 -584,15 +593,14 @@@ var Lexer = (function LexerClosure()
x = (x << 3) + (ch & 0x0F);
}
}
-
strBuf.push(String.fromCharCode(x));
break;
- case 0x0A: case 0x0D: // LF, CR
+ case 0x0D: // CR
+ if (this.peekChar() === 0x0A) { // LF
+ this.nextChar();
+ }
+ break;
+ case 0x0A: // LF
break;
default:
strBuf.push(String.fromCharCode(ch));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list