Check-in [97c9f43cea]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:completing the previous commit
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 97c9f43cea4fcd54f4cd36f9cac05ae9160b444d
User & Date: sandro 2018-02-22 14:10:07
Context
2018-02-22
14:13
properly indenting the sources check-in: 9907dcec7f user: sandro tags: trunk
14:10
completing the previous commit check-in: 97c9f43cea user: sandro tags: trunk
13:47
fixing security issues - Red Hat Bugzilla – Bug 1547892 check-in: 1f00f424a2 user: sandro tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to headers/freexl.h.

288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
                                                 failed. Possibly a corrupt file
                                                 or a bug in FreeXL. */
#define FREEXL_INVALID_MINI_STREAM	-24 /**< The MiniFAT stream is invalid.
                                                 Possibly a corrupt file. */
#define FREEXL_CFBF_ILLEGAL_MINI_FAT_ENTRY	-25 /**< The MiniFAT stream 
                                                     contains an invalid entry.
                                                     Possibly a corrupt file. */
#define FREEXL_CRAFTED_FILE					-26 /**< A severely corrupted file
                                                     (may be purposely crafted for 
                                                     malicious purposes) has been 
                                                     detected. */


    /**
     Container for a cell value
     
     freexl_get_cell_value() takes a pointer to this structure, and fills
     in the appropriate values.







|
|
|
|







288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
                                                 failed. Possibly a corrupt file
                                                 or a bug in FreeXL. */
#define FREEXL_INVALID_MINI_STREAM	-24 /**< The MiniFAT stream is invalid.
                                                 Possibly a corrupt file. */
#define FREEXL_CFBF_ILLEGAL_MINI_FAT_ENTRY	-25 /**< The MiniFAT stream 
                                                     contains an invalid entry.
                                                     Possibly a corrupt file. */
#define FREEXL_CRAFTED_FILE			-26 /**< A severely corrupted file
                                                 (may be purposely crafted for 
                                                 malicious purposes) has been 
                                                 detected. */


    /**
     Container for a cell value
     
     freexl_get_cell_value() takes a pointer to this structure, and fills
     in the appropriate values.

Changes to src/freexl.c.

1105
1106
1107
1108
1109
1110
1111






1112
1113
1114
1115
1116
1117
1118
	(double) sizeof (biff_cell_value) *
	(double) (workbook->active_sheet->rows) *
	(double) (workbook->active_sheet->columns);
    if (dsize > 256.0 * 1024.0 * 1024.0)
	return FREEXL_INSUFFICIENT_MEMORY;

/* allocating the cell values array */






    workbook->active_sheet->cell_values =
	malloc (sizeof (biff_cell_value) *
		(workbook->active_sheet->rows *
		 workbook->active_sheet->columns));
    if (workbook->active_sheet->cell_values == NULL)
	return FREEXL_INSUFFICIENT_MEMORY;
    for (row = 0; row < workbook->active_sheet->rows; row++)







>
>
>
>
>
>







1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
	(double) sizeof (biff_cell_value) *
	(double) (workbook->active_sheet->rows) *
	(double) (workbook->active_sheet->columns);
    if (dsize > 256.0 * 1024.0 * 1024.0)
	return FREEXL_INSUFFICIENT_MEMORY;

/* allocating the cell values array */
    if (workbook->active_sheet->rows *
		 workbook->active_sheet->columns <= 0)
		 {
    workbook->active_sheet->cell_values = NULL;
    return FREEXL_OK;
		 }
    workbook->active_sheet->cell_values =
	malloc (sizeof (biff_cell_value) *
		(workbook->active_sheet->rows *
		 workbook->active_sheet->columns));
    if (workbook->active_sheet->cell_values == NULL)
	return FREEXL_INSUFFICIENT_MEMORY;
    for (row = 0; row < workbook->active_sheet->rows; row++)