6bcb4e3ad9
Note how, in the `if (this.stateManager.stateStack.length !== 0) {` branch, we're attempting to access the not yet defined variable[1] `args`. If this code-path is ever hit, an Error will be thrown and parsing will thus be aborted immediately (likely leading to e.g. rendering bugs).
Note that I found this purely by accident, since I happened to glance at the LGTM report. However, I've since found that the error is also present during the unit-test[2] and with this patch we're actually testing the *intended* thing here.
As part of fixing this, and to avoid re-introducing a similar bug in the future, we'll now instead always reset `args.length` *before* attempting to read the next operator.
Also, we can use the existing `EvaluatorPreprocessor.savedStatesDepth` getter to simplify the save/restore detection a tiny bit.
---
[1] The ESLint rule `no-use-before-define` would have helped catch this problem, but unfortunately we cannot enable that without quite a bit of refactoring all over the code-base.
[2] The unit-test was updated such that it would fail in the `master`-branch.
56 lines
1.9 KiB
JavaScript
56 lines
1.9 KiB
JavaScript
/* Copyright 2020 Mozilla Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
import {
|
|
createDefaultAppearance,
|
|
parseDefaultAppearance,
|
|
} from "../../src/core/default_appearance.js";
|
|
import { Name } from "../../src/core/primitives.js";
|
|
|
|
describe("Default appearance", function () {
|
|
describe("parseDefaultAppearance and createDefaultAppearance", function () {
|
|
it("should parse and create default appearance", function () {
|
|
const da = "/FontName 12 Tf 0.10 0.20 0.30 rg";
|
|
const result = {
|
|
fontSize: 12,
|
|
fontName: Name.get("FontName"),
|
|
fontColor: new Uint8ClampedArray([26, 51, 76]),
|
|
};
|
|
expect(parseDefaultAppearance(da)).toEqual(result);
|
|
expect(createDefaultAppearance(result)).toEqual(da);
|
|
|
|
expect(
|
|
parseDefaultAppearance(
|
|
"0.1 0.2 0.3 rg /FontName 12 Tf 0.3 0.2 0.1 rg /NameFont 13 Tf"
|
|
)
|
|
).toEqual({
|
|
fontSize: 13,
|
|
fontName: Name.get("NameFont"),
|
|
fontColor: new Uint8ClampedArray([76, 51, 26]),
|
|
});
|
|
});
|
|
|
|
it("should parse default appearance with save/restore", function () {
|
|
const da =
|
|
"q Q 0.10 0.20 0.30 rg /FontName 12 Tf q 0.30 0.20 0.10 rg /NameFont 13 Tf Q";
|
|
expect(parseDefaultAppearance(da)).toEqual({
|
|
fontSize: 12,
|
|
fontName: Name.get("FontName"),
|
|
fontColor: new Uint8ClampedArray([26, 51, 76]),
|
|
});
|
|
});
|
|
});
|
|
});
|