X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=filter.c;h=a4399399b168d267d47b4ed18374c501b77afc8a;hb=49aa0214d72eb609845e292772819de414034c55;hp=5aa148cf9a54629b3c27620c16a9bd3120b984dd;hpb=dc7bcc12ac9a3abea869169f5efea8222b8eb775;p=pkg%2Fabook.git diff --git a/filter.c b/filter.c index 5aa148c..a439939 100644 --- a/filter.c +++ b/filter.c @@ -134,7 +134,7 @@ get_real_name() pwent = getpwnam(username); - if( (tmp = malloc(strlen(pwent->pw_gecos) +1)) == NULL) + if( (tmp = (char *)malloc(strlen(pwent->pw_gecos) +1)) == NULL) return strdup(username); rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp); @@ -647,7 +647,7 @@ mutt_read_line(FILE *in, char **alias, char **rest) while( ! ISSPACE(*ptr) ) ptr++; - if( (*alias = malloc(ptr-tmp+1)) == NULL) + if( (*alias = (char *)malloc(ptr-tmp+1)) == NULL) return 1; strncpy(*alias, tmp, ptr-tmp); @@ -900,7 +900,7 @@ pine_convert_emails(char *s) *tmp=0; for(i=1; ( tmp = strchr(s, ',') ) != NULL ; i++, s=tmp+1 ) - if( i > 3 ) { + if( i > MAX_EMAILS - 1 ) { *tmp = 0; break; } @@ -954,7 +954,7 @@ pine_parse_file(FILE *in) while(!feof(in)) { for(i=2;;i++) { - buf = realloc(buf, i*LINESIZE); + buf = (char *) realloc(buf, i*LINESIZE); if(i==2) strcpy(buf, line); fgets(line, LINESIZE, in); @@ -966,8 +966,10 @@ pine_parse_file(FILE *in) strcat(buf, ptr); } - if( *buf == '#' ) + if( *buf == '#' ) { + my_free(buf); continue; + } pine_fixbuf(buf); pine_parse_buf(buf);