libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoided memory overflow with Aaip_encode_debuG

Browse Source
This commit is contained in:
Thomas Schmitt 2009-01-17 20:25:00 +01:00
parent 20adf50275
commit ece6eca9a5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libisofs/aaip_0_2.c
View File

@ -18,7 +18,8 @@
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
/* <<< */ /* <<<
*/
#define Aaip_encode_debuG 1 #define Aaip_encode_debuG 1
#include "aaip_0_2.h" #include "aaip_0_2.h"
@ -91,6 +92,8 @@ unsigned int aaip_encode(char aa_name[2],
*result= (unsigned char *) calloc(1, mem_size); *result= (unsigned char *) calloc(1, mem_size);
#endif #endif
if(*result == NULL)
return 0;
/* Encode pairs into result */ /* Encode pairs into result */
for(i= 0; i < num_attrs; i++) { for(i= 0; i < num_attrs; i++) {
@ -118,6 +121,14 @@ unsigned int aaip_encode(char aa_name[2],
if(*result_len != mem_size) { if(*result_len != mem_size) {
fprintf(stderr, "aaip_encode(): MEMORY MISMATCH BY %d BYTES\n", fprintf(stderr, "aaip_encode(): MEMORY MISMATCH BY %d BYTES\n",
(int) (mem_size - *result_len)); (int) (mem_size - *result_len));
} else {
unsigned char *hpt;
hpt= malloc(*result_len);
if(hpt != NULL) {
memcpy(hpt, *result, *result_len);
free(*result);
*result= hpt;
}
} }
ret= 0; ret= 0;
for(i= 0; i < *result_len; i+= ((unsigned char *) (*result))[i + 2]) for(i= 0; i < *result_len; i+= ((unsigned char *) (*result))[i + 2])