tyrolyean
/
mailattach
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent array jumps 

Signed-off-by: tyrolyean <tyrolyean@tyrolyean.net>
This commit is contained in:
tyrolyean 2020-05-01 02:12:34 +02:00
parent ab3ce4eab9
commit be37de038d
No known key found for this signature in database
GPG Key ID: EDD105663B707C62
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/attach.c
View File

@ -199,7 +199,7 @@ void unravel_multipart_mail(struct email_t* mail){
continue; continue;
} }
struct email_t *submail = mail_from_text((char*)begin_pointer, struct email_t *submail = mail_from_text((char*)begin_pointer,
end_pointer - begin_pointer + 1, mail); end_pointer - begin_pointer, mail);
mail->submes = realloc(mail->submes, ++mail->submes_cnt * mail->submes = realloc(mail->submes, ++mail->submes_cnt *
(sizeof(struct email_t))); (sizeof(struct email_t)));
mail->submes[mail->submes_cnt - 1] = submail; mail->submes[mail->submes_cnt - 1] = submail;
@ -364,10 +364,13 @@ int replace_files(struct email_t* mail, const char* dirname, bool* created){
if(mail->is_multipart){ if(mail->is_multipart){
for(size_t i = 0; i < mail->submes_cnt; i++){ for(size_t i = 0; i < mail->submes_cnt; i++){
if(replace_files(mail->submes[i], dirname, created) int n = replace_files(mail->submes[i], dirname,
< 0){ created) ;
if(n < 0){
return -1; return -1;
} else if(n == 1){
i--;
} }
} }
return 0; return 0;
@ -481,6 +484,6 @@ int replace_files(struct email_t* mail, const char* dirname, bool* created){
free(chosen_filename); free(chosen_filename);
free_submails(mail); free_submails(mail);
free(mail); free(mail);
return 0; return 1;
} }