Skip to content

Return when setting font to invalid CSS font string #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2019
Merged

Return when setting font to invalid CSS font string #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/CanvasRenderingContext2d.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,10 @@ NAN_SETTER(Context2d::SetFont) {

MaybeLocal<Value> mparsed = _parseFont.Get(iso)->Call(ctx, ctx->Global(), argc, argv);
if (mparsed.IsEmpty()) return;
MaybeLocal<Object> mfont = Nan::To<Object>(mparsed.ToLocalChecked());
Local<Value> mparsedChecked = mparsed.ToLocalChecked();
// parseFont returns undefined for invalid CSS font strings
if (mparsedChecked->IsUndefined()) return;
MaybeLocal<Object> mfont = Nan::To<Object>(mparsedChecked);
if (mfont.IsEmpty()) return;
Local<Object> font = mfont.ToLocalChecked();

Expand Down
18 changes: 9 additions & 9 deletions test/canvas.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ describe('Canvas', function () {
assert.deepEqual(actual, expected, 'Failed to parse: ' + str);
}

assert.throws(() => {
const ctx = createCanvas(10, 10).getContext('2d')
ctx.font = 'bold undefinedpx Arial'
})
assert.strictEqual(parseFont('Helvetica, sans'), undefined)
});

it('registerFont', function () {
Expand Down Expand Up @@ -417,12 +414,15 @@ describe('Canvas', function () {
});

it('Context2d#font=', function () {
var canvas = createCanvas(200, 200)
, ctx = canvas.getContext('2d');
const canvas = createCanvas(200, 200)
const ctx = canvas.getContext('2d')

assert.equal(ctx.font, '10px sans-serif')
ctx.font = '15px Arial, sans-serif'
assert.equal(ctx.font, '15px Arial, sans-serif')

assert.equal('10px sans-serif', ctx.font);
ctx.font = '15px Arial, sans-serif';
assert.equal('15px Arial, sans-serif', ctx.font);
ctx.font = 'Helvetica, sans' // invalid
assert.equal(ctx.font, '15px Arial, sans-serif')
});

it('Context2d#lineWidth=', function () {
Expand Down