aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance option parsing with robust error handling and improved value validation

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-08 19:36:16 +01:00
parent ae19b9198f
commit dd20ab4531
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/options.c
View File

@@ -15,14 +15,14 @@
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <errno.h>
#include <limits.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "aaruformat.h"
#include "internal.h"
#include "structs/options.h" #include "structs/options.h"
#include "log.h" #include "log.h"
@@ -37,7 +37,8 @@
*/ */
aaru_options parse_options(const char *options) aaru_options parse_options(const char *options)
{ {
TRACE("Entering parse_options(%s)", options); const char *options_str = options != NULL ? options : "(null)";
TRACE("Entering parse_options(%s)", options_str);
aaru_options parsed = {.compress = true, aaru_options parsed = {.compress = true,
.deduplicate = true, .deduplicate = true,
@@ -53,7 +54,7 @@ aaru_options parse_options(const char *options)
if(options == NULL) if(options == NULL)
{ {
TRACE("Exiting aaruf_open() = {compress: %d, deduplicate: %d, dictionary: %u, table_shift: %u, " TRACE("Exiting parse_options() = {compress: %d, deduplicate: %d, dictionary: %u, table_shift: %d, "
"data_shift: %u, block_alignment: %u, md5: %d, sha1: %d, sha256: %d, blake3: %d, spamsum: %d}", "data_shift: %u, block_alignment: %u, md5: %d, sha1: %d, sha256: %d, blake3: %d, spamsum: %d}",
parsed.compress, parsed.deduplicate, parsed.dictionary, parsed.table_shift, parsed.data_shift, parsed.compress, parsed.deduplicate, parsed.dictionary, parsed.table_shift, parsed.data_shift,
parsed.block_alignment, parsed.md5, parsed.sha1, parsed.sha256, parsed.blake3, parsed.spamsum); parsed.block_alignment, parsed.md5, parsed.sha1, parsed.sha256, parsed.blake3, parsed.spamsum);
@@ -64,7 +65,8 @@ aaru_options parse_options(const char *options)
strncpy(buffer, options, sizeof(buffer)); strncpy(buffer, options, sizeof(buffer));
buffer[sizeof(buffer) - 1] = '\0'; buffer[sizeof(buffer) - 1] = '\0';
const char *token = strtok(buffer, ";"); char *saveptr = NULL;
char *token = strtok_r(buffer, ";", &saveptr);
while(token != NULL) while(token != NULL)
{ {
char *equal = strchr(token, '='); char *equal = strchr(token, '=');
@@ -87,19 +89,41 @@ aaru_options parse_options(const char *options)
} }
else if(strncmp(key, "table_shift", 11) == 0) else if(strncmp(key, "table_shift", 11) == 0)
{ {
parsed.table_shift = (uint8_t)atoi(value); errno = 0;
char *endptr = NULL;
long parsed_value = strtol(value, &endptr, 10);
if(errno == 0 && endptr != value)
{
if(parsed_value < INT8_MIN) parsed_value = INT8_MIN;
if(parsed_value > INT8_MAX) parsed_value = INT8_MAX;
parsed.table_shift = (int8_t)parsed_value;
if(parsed.table_shift == 0) parsed.table_shift = 9; if(parsed.table_shift == 0) parsed.table_shift = 9;
} }
}
else if(strncmp(key, "data_shift", 10) == 0) else if(strncmp(key, "data_shift", 10) == 0)
{ {
parsed.data_shift = (uint8_t)atoi(value); errno = 0;
char *endptr = NULL;
long parsed_value = strtol(value, &endptr, 10);
if(errno == 0 && endptr != value && parsed_value >= 0)
{
if(parsed_value > UINT8_MAX) parsed_value = UINT8_MAX;
parsed.data_shift = (uint8_t)parsed_value;
if(parsed.data_shift == 0) parsed.data_shift = 12; if(parsed.data_shift == 0) parsed.data_shift = 12;
} }
}
else if(strncmp(key, "block_alignment", 15) == 0) else if(strncmp(key, "block_alignment", 15) == 0)
{ {
parsed.block_alignment = (uint8_t)atoi(value); errno = 0;
char *endptr = NULL;
long parsed_value = strtol(value, &endptr, 10);
if(errno == 0 && endptr != value && parsed_value >= 0)
{
if(parsed_value > UINT8_MAX) parsed_value = UINT8_MAX;
parsed.block_alignment = (uint8_t)parsed_value;
if(parsed.block_alignment == 0) parsed.block_alignment = 9; if(parsed.block_alignment == 0) parsed.block_alignment = 9;
} }
}
else if(strncmp(key, "md5", 3) == 0) else if(strncmp(key, "md5", 3) == 0)
parsed.md5 = bval; parsed.md5 = bval;
else if(strncmp(key, "sha1", 4) == 0) else if(strncmp(key, "sha1", 4) == 0)
@@ -111,10 +135,10 @@ aaru_options parse_options(const char *options)
else if(strncmp(key, "spamsum", 7) == 0) else if(strncmp(key, "spamsum", 7) == 0)
parsed.spamsum = bval; parsed.spamsum = bval;
} }
token = strtok(NULL, ";"); token = strtok_r(NULL, ";", &saveptr);
} }
TRACE("Exiting aaruf_open() = {compress: %d, deduplicate: %d, dictionary: %u, table_shift: %u, " TRACE("Exiting parse_options() = {compress: %d, deduplicate: %d, dictionary: %u, table_shift: %d, "
"data_shift: %u, block_alignment: %u, md5: %d, sha1: %d, sha256: %d, blake3: %d, spamsum: %d}", "data_shift: %u, block_alignment: %u, md5: %d, sha1: %d, sha256: %d, blake3: %d, spamsum: %d}",
parsed.compress, parsed.deduplicate, parsed.dictionary, parsed.table_shift, parsed.data_shift, parsed.compress, parsed.deduplicate, parsed.dictionary, parsed.table_shift, parsed.data_shift,
parsed.block_alignment, parsed.md5, parsed.sha1, parsed.sha256, parsed.blake3, parsed.spamsum); parsed.block_alignment, parsed.md5, parsed.sha1, parsed.sha256, parsed.blake3, parsed.spamsum);