Skip to content

Commit

Permalink
Fix valgrind jump or move on unconditional
Browse files Browse the repository at this point in the history
  • Loading branch information
PartialVolume committed Mar 28, 2024
1 parent 8ad4fe2 commit 00bcce4
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,12 @@ int nwipe_conf_update_setting( char* group_name_setting_name, char* setting_valu

int nwipe_conf_read_setting( char* group_name_setting_name, const char** setting_value )
{
/* You would call this function if you wanted to read a settings value in nwipe.conf, i.e
/* This function returns a setting value from nwipe's configuration file nwipe.conf
* when provided with a groupname.settingname string.
*
* Example:
* const char ** pReturnString;
* nwipe_conf_read_setting( "PDF_Certificate", "PDF_Enable", pReturnString );
*
*/

/* Separate group_name_setting_name i.e "PDF_Certificate.PDF_Enable" string
Expand All @@ -406,20 +407,20 @@ int nwipe_conf_read_setting( char* group_name_setting_name, const char** setting
int return_status;
int length = strlen( group_name_setting_name );

char* group_name = malloc( length );
char* setting_name = malloc( length );
char* group_name = calloc( length, sizeof( char ) );
char* setting_name = calloc( length, sizeof( char ) );

int idx = 0;

while( group_name_setting_name[idx] != 0 && group_name_setting_name[idx] != '.' )
{
if( group_name_setting_name[idx] == '.' )
{
break;
}
idx++;
}
// Copy the group name from the combined input string
memcpy( group_name, group_name_setting_name, idx );
group_name[idx] = '\0'; // Null-terminate group_name

// Copy the setting name from the combined input string
strcpy( setting_name, &group_name_setting_name[idx + 1] );

if( !( setting = config_lookup( &nwipe_cfg, group_name ) ) )
Expand Down

0 comments on commit 00bcce4

Please sign in to comment.