openmamba/distromatic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reports: fix a buffer overflow in obsoletebuf

Browse Source
This commit is contained in:
Silvan Calarco 2013-01-02 00:10:44 +01:00
parent b358e4a43b
commit 3d17bddc92
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/distromatic.c
View File

@ -1270,7 +1270,8 @@ main(int argc, char *argv[])
if (mode & MODE_DATA_TABLES) { if (mode & MODE_DATA_TABLES) {
if (!quietmode) fprintf(stdout, " - writing dependencies table...\n"); if (!quietmode) fprintf(stdout, " - writing dependencies table...\n");
print_datatables(configtag,i); } print_datatables(configtag,i);
}
if (genheader_mode & GENHEADER_STATS) { if (genheader_mode & GENHEADER_STATS) {
if (!quietmode) if (!quietmode)

19
src/reports.c
View File

@ -1803,10 +1803,10 @@ print_datatables(struct configTag *ct, int arch) {
char builddeps_filename[1024], deps_filename[1024], virtual_filename[1024], char builddeps_filename[1024], deps_filename[1024], virtual_filename[1024],
builds_filename[1024], builds_sh_filename[1024], sources_filename[1024], builds_filename[1024], builds_sh_filename[1024], sources_filename[1024],
contents_filename[1024], buf[1024]; contents_filename[1024], buf[1024];
char obsoletebuf[1024]; char obsoletebuf[PATH_MAX];
struct headerList *currheaderlist, *currchild; struct headerList *currheaderlist, *currchild;
struct headerSourceList * currheadersourcelist; struct headerSourceList * currheadersourcelist;
int i, depscnt, nonobsoletednumproviders; int i, nonobsoletednumproviders;
snprintf(builddeps_filename,1024,"%sbuilddeps-%s",ct->html_dir,ct->arch[arch]); snprintf(builddeps_filename,1024,"%sbuilddeps-%s",ct->html_dir,ct->arch[arch]);
snprintf(deps_filename,1024,"%sdeps-%s",ct->html_dir,ct->arch[arch]); snprintf(deps_filename,1024,"%sdeps-%s",ct->html_dir,ct->arch[arch]);
@ -1893,6 +1893,7 @@ print_datatables(struct configTag *ct, int arch) {
fprintf(fb,"\n"); fprintf(fb,"\n");
// write deps file // write deps file
logmsg(LOG_DEBUG,"writing deps files (1)");
struct providedList* provided = ct->providedlist_idx[arch][0]; struct providedList* provided = ct->providedlist_idx[arch][0];
while (provided) { while (provided) {
nonobsoletednumproviders=0; nonobsoletednumproviders=0;
@ -1954,8 +1955,10 @@ print_datatables(struct configTag *ct, int arch) {
} }
//write contents (filenames) //write contents (filenames)
logmsg(LOG_DEBUG,"writing contents file");
print_contents_subtree(fc,ct->filetree[arch],ct,buf,1024); print_contents_subtree(fc,ct->filetree[arch],ct,buf,1024);
logmsg(LOG_DEBUG,"writing deps files (2)");
currheaderlist = ct->headerlist[arch]; currheaderlist = ct->headerlist[arch];
while (currheaderlist) { while (currheaderlist) {
fprintf(fd,"%s: ", currheaderlist->name); fprintf(fd,"%s: ", currheaderlist->name);
@ -2018,6 +2021,7 @@ print_datatables(struct configTag *ct, int arch) {
// //
// headersourcelist scan: write builds and sources files // headersourcelist scan: write builds and sources files
// //
logmsg(LOG_DEBUG,"writing builds and sources files (1)");
fprintf(fbsh,"pkg_list=("); fprintf(fbsh,"pkg_list=(");
currheadersourcelist = ct->headersourcelist; currheadersourcelist = ct->headersourcelist;
while (currheadersourcelist != NULL) { while (currheadersourcelist != NULL) {
@ -2030,9 +2034,8 @@ print_datatables(struct configTag *ct, int arch) {
} }
fprintf(fbsh,");\n"); fprintf(fbsh,");\n");
depscnt = 0;
currheadersourcelist = ct->headersourcelist; currheadersourcelist = ct->headersourcelist;
logmsg(LOG_DEBUG,"writing builds and sources files (2)");
while (currheadersourcelist != NULL) { while (currheadersourcelist != NULL) {
currchild = currheadersourcelist->firstchild[arch]; currchild = currheadersourcelist->firstchild[arch];
@ -2066,8 +2069,12 @@ print_datatables(struct configTag *ct, int arch) {
fprintf(fbsh,"%s",currchild->name); fprintf(fbsh,"%s",currchild->name);
fprintf(fb," %s",currchild->name); fprintf(fb," %s",currchild->name);
for (i = 0; i < currchild->obsoletecount; i++ ) { for (i = 0; i < currchild->obsoletecount; i++ ) {
if (obsoletebuf[0] != '\0') strncat(obsoletebuf," ",1024); if (strlen(obsoletebuf) + strlen(currchild->obsoletename[i]) >= PATH_MAX - 2) {
strncat(obsoletebuf,currchild->obsoletename[i],1024); logmsg(LOG_WARNING, "reached obsoletebuf maximum size (%d); skipping further obsoletes", PATH_MAX);
break;
}
if (obsoletebuf[0] != '\0') strcat(obsoletebuf," ");
strcat(obsoletebuf,currchild->obsoletename[i]);
} }
currchild = currchild->nextbrother; currchild = currchild->nextbrother;
if (currchild) fprintf(fbsh," "); if (currchild) fprintf(fbsh," ");