Skip to content

Commit 89e5011

Browse files
fixing bugs
1 parent 03ac5d6 commit 89e5011

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

src/encryption/encryption_interface/b64/fdefine.encryption_interface_b64.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ unsigned char *DtwEncriptionInterface_decrypt_buffer_b64(DtwEncriptionInterface
1616
long b64_out_size;
1717
unsigned char *decoded = dtw_base64_decode(encrypted_value,&b64_out_size);
1818
if(decoded == NULL){
19+
*is_binary = false;
20+
*out_size = 0;
1921
return NULL;
2022
}
2123
unsigned char * decrypted = DtwEncriptionInterface_decrypt_buffer(self,decoded,b64_out_size,out_size,is_binary);
@@ -44,7 +46,11 @@ bool DtwEncriptionInterface_write_string_file_content_b64(DtwEncriptionInterface
4446

4547
unsigned char *DtwEncriptionInterface_load_any_content_b64(DtwEncriptionInterface *self,const char *file_name,long *out_size,bool *is_binary){
4648
char *loaded = dtw_load_string_file_content(file_name);
47-
49+
if(loaded == NULL){
50+
*is_binary = false;
51+
*out_size = 0;
52+
return NULL;
53+
}
4854
unsigned char *decrypted = DtwEncriptionInterface_decrypt_buffer_b64(self,(const char *)loaded,out_size,is_binary);
4955
free(loaded);
5056
return decrypted;

src/encryption/encryption_interface/files/fdefine.encryption_interface_files.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ unsigned char *DtwEncriptionInterface_load_any_content(DtwEncriptionInterface *s
2323
long raw_size;
2424
unsigned char *loaded = dtw_load_binary_content(file_name,&raw_size);
2525
if(loaded == NULL){
26+
*is_binary = false;
27+
*out_size = 0;
2628
return NULL;
2729
}
2830
unsigned char *decrypted = DtwEncriptionInterface_decrypt_buffer(self,loaded,raw_size,out_size,is_binary);

src/encryption/encryption_interface/hex/fdefine.encryption_interface_hex.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ unsigned char *DtwEncriptionInterface_decrypt_buffer_hex(DtwEncriptionInterface
3030
bool DtwEncriptionInterface_write_any_content_hex(DtwEncriptionInterface *self,const char *file_name,unsigned char *value,long size){
3131

3232
char *data = DtwEncriptionInterface_encrypt_buffer_hex(self,value,size);
33+
if(data == NULL){
34+
return false;
35+
}
3336
bool result = dtw_write_string_file_content(file_name,data);
3437
free(data);
3538
return result;
@@ -41,6 +44,12 @@ bool DtwEncriptionInterface_write_string_file_content_hex(DtwEncriptionInterface
4144

4245
unsigned char *DtwEncriptionInterface_load_any_content_hex(DtwEncriptionInterface *self,const char *file_name,long *out_size,bool *is_binary){
4346
char *data = dtw_load_string_file_content(file_name);
47+
if(data == NULL){
48+
*is_binary = false;
49+
*out_size = 0;
50+
return NULL;
51+
}
52+
4453
unsigned char *decrypted = DtwEncriptionInterface_decrypt_buffer_hex(self,data,out_size,is_binary);
4554
free(data);
4655
return decrypted;

0 commit comments

Comments
 (0)