bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check return value of fgets calls

Browse source 
Prevents compiler warnings with -D_FORTIFY_SOURCE=2

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2010-06-27 21:44:36 +10:00 • committed by Dan McGee
parent 686b8c1463
commit 60de8ec932
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/be_files.c
View file

@ -657,7 +657,9 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
goto error; goto error;
} }
while(!feof(fp)) { while(!feof(fp)) {
fgets(line, 255, fp); if(fgets(line, 256, fp) == NULL) {
break;
}
_alpm_strtrim(line); _alpm_strtrim(line);
if(strcmp(line, "%DEPENDS%") == 0) { if(strcmp(line, "%DEPENDS%") == 0) {
while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
@ -693,7 +695,9 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
snprintf(path, PATH_MAX, "%sdeltas", pkgpath); snprintf(path, PATH_MAX, "%sdeltas", pkgpath);
if((fp = fopen(path, "r"))) { if((fp = fopen(path, "r"))) {
while(!feof(fp)) { while(!feof(fp)) {
fgets(line, 255, fp); if(fgets(line, 256, fp) == NULL) {
break;
}
_alpm_strtrim(line); _alpm_strtrim(line);
if(strcmp(line, "%DELTAS%") == 0) { if(strcmp(line, "%DELTAS%") == 0) {
while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {

3
lib/libalpm/trans.c
View file

@ -324,8 +324,7 @@ static int grep(const char *fn, const char *needle)
while(!feof(fp)) { while(!feof(fp)) {
char line[1024]; char line[1024];
int sline = sizeof(line)-1; int sline = sizeof(line)-1;
fgets(line, sline, fp); if(fgets(line, sline, fp) == NULL) {
if(feof(fp)) {
continue; continue;
} }
if(strstr(line, needle)) { if(strstr(line, needle)) {