c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

workbook: fix buffer underflow in defined names

Browse Source 
Closes #444
This commit is contained in:
John McNamara 2024-05-16 00:53:08 +01:00
parent 284b61ba0b
commit af0b03a8f0
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/workbook.c
View File

@ -678,6 +678,9 @@ _store_defined_name(lxw_workbook *self, const char *name,
if (!name || !formula)
return LXW_ERROR_NULL_PARAMETER_IGNORED;
if (strlen(name) == 0 || strlen(formula) == 0)
return LXW_ERROR_PARAMETER_VALIDATION;
if (lxw_utf8_strlen(name) > LXW_DEFINED_NAME_LENGTH ||
lxw_utf8_strlen(formula) > LXW_DEFINED_NAME_LENGTH) {
return LXW_ERROR_128_STRING_LENGTH_EXCEEDED;
@ -710,6 +713,9 @@ _store_defined_name(lxw_workbook *self, const char *name,
tmp_str++;
worksheet_name = name_copy;
if (strlen(tmp_str) == 0 || strlen(worksheet_name) == 0)
goto mem_error;
/* Remove any worksheet quoting. */
if (worksheet_name[0] == '\'')
worksheet_name++;
@ -933,11 +939,22 @@ _populate_range_dimensions(lxw_workbook *self, lxw_series_range *range)
return;
}
else {
/* Peek forward to check for empty string. */
if (tmp_str[1] == '\0') {
range->ignore_cache = LXW_TRUE;
return;
}
/* Split the formulas into sheetname and row-col data. */
*tmp_str = '\0';
tmp_str++;
sheetname = formula;
if (strlen(tmp_str) == 0 || strlen(sheetname) == 0) {
range->ignore_cache = LXW_TRUE;
return;
}
/* Remove any worksheet quoting. */
if (sheetname[0] == '\'')
sheetname++;

25
test/unit/workbook/test_workbook_write_defined_names.c
View File

@ -65,3 +65,28 @@ CTEST(workbook, write_defined_names_sorted) {
lxw_workbook_free(workbook);
}
/* Test invalid names formats. */
CTEST(workbook, write_defined_names_invalid) {
char* got;
char exp[] = "";
FILE* testfile = lxw_tmpfile(NULL);
lxw_workbook *workbook = workbook_new(NULL);
workbook->file = testfile;
workbook_add_worksheet(workbook, NULL);
workbook_define_name(workbook, "", "=123");
workbook_define_name(workbook, "Foo", "");
workbook_define_name(workbook, "Sheet1!", "=123");
workbook_define_name(workbook, "!", "=123");
_write_defined_names(workbook);
RUN_XLSX_STREQ(exp, got);
lxw_workbook_free(workbook);
}