Skip to content

fix: #877 and #880 #887

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 4 commits into from
Jul 30, 2019
Merged

fix: #877 and #880 #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a58eab4
add(tests): hyperlink with empty text crashes write
Jun 29, 2019
872dd90
fix(xform): hyperlink with empty text crashes write (#877)
Jun 29, 2019
9ed9163
add(tests): malformed comment crashes on write
Jun 30, 2019
d3e60c8
fix(comment): malformed comment crashes on write (#880)
Jun 30, 2019
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
2 changes: 1 addition & 1 deletion lib/xlsx/xform/comment/comment-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ utils.inherits(CommentXform, BaseXform, {
authorId: 0,
});
xmlStream.openNode('text');
if (model.note.texts) {
if (model && model.note && model.note.texts) {
model.note.texts.forEach(text => {
this.richTextXform.render(xmlStream, text);
});
Expand Down
2 changes: 1 addition & 1 deletion lib/xlsx/xform/sheet/cell-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class CellXform extends BaseXform {
}
break;
case Enums.ValueType.Hyperlink:
if (options.sharedStrings) {
if (options.sharedStrings && model.text !== undefined && model.text !== null) {
model.ssId = options.sharedStrings.add(model.text);
}
options.hyperlinks.push(
Expand Down
Binary file added spec/integration/data/test-issue-877.xlsx
View file
Open in desktop
Binary file not shown.
Binary file added spec/integration/data/test-issue-880.xlsx
View file
Open in desktop
Binary file not shown.
32 changes: 32 additions & 0 deletions spec/integration/issues/issue-877-hyperlink-no-text.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict';

const fs = require('fs');

const verquire = require('../../utils/verquire');

const Excel = verquire('excel');

// this file to contain integration tests created from github issues
const TEST_XLSX_FILE_NAME = './spec/out/wb-issue-877.test.xlsx';

describe('github issues', () => {
it('issue 877 - hyperlink without text crashes on write', () => {

const wb = new Excel.Workbook();
return wb.xlsx
// .readFile('./spec/integration/data/test-issue-877.xlsx')
.readFile('./spec/integration/data/test-issue-877.xlsx')
.then(() => {
wb.xlsx
.writeBuffer({
useStyles: true,
useSharedStrings: true,
})
.then(function(buffer) {
const wstream = fs.createWriteStream(TEST_XLSX_FILE_NAME);
wstream.write(buffer);
wstream.end();
});
});
});
});
32 changes: 32 additions & 0 deletions spec/integration/issues/issue-880-malformed-comment.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict';

const fs = require('fs');

const verquire = require('../../utils/verquire');

const Excel = verquire('excel');

// this file to contain integration tests created from github issues
const TEST_XLSX_FILE_NAME = './spec/out/wb-issue-880.test.xlsx';

describe('github issues', () => {

it('issue 880 - malformed comment crashes on write', () => {

const wb = new Excel.Workbook();
return wb.xlsx
.readFile('./spec/integration/data/test-issue-880.xlsx')
.then(() => {
wb.xlsx
.writeBuffer({
useStyles: true,
useSharedStrings: true,
})
.then(function(buffer) {
const wstream = fs.createWriteStream(TEST_XLSX_FILE_NAME);
wstream.write(buffer);
wstream.end();
});
});
}).timeout(6000);
});