Mercurial > mplayer.hg
changeset 1096:bf973bffe240
some possible buffer overflow places fixed
| author | al3x |
|---|---|
| date | Mon, 11 Jun 2001 12:47:48 +0000 |
| parents | c1daff266657 |
| children | 6143de76e2e3 |
| files | TOOLS/asfinfo.c TOOLS/png2raw.c loader/dshow/DS_Filter.c loader/vfl.c loader/win32.c |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/TOOLS/asfinfo.c Mon Jun 11 12:41:53 2001 +0000 +++ b/TOOLS/asfinfo.c Mon Jun 11 12:47:48 2001 +0000 @@ -231,7 +231,7 @@ #ifdef SAVE_STREAMS if(!streams[sh->streamno&0x7F]){ char name[256]; - sprintf(name,"stream%02X.dat",sh->streamno&0x7F); + snprintf(name,256,"stream%02X.dat",sh->streamno&0x7F); streams[sh->streamno&0x7F]=fopen(name,"wb"); } fwrite(p,len,1,streams[sh->streamno&0x7F]);
--- a/TOOLS/png2raw.c Mon Jun 11 12:41:53 2001 +0000 +++ b/TOOLS/png2raw.c Mon Jun 11 12:47:48 2001 +0000 @@ -162,7 +162,7 @@ printf("Converting %s...\n",argv[0]); if(pngRead(argv[0],&ize)) continue; if(ize.BPP!=8){ printf("Invalid BPP: %d\n",ize.BPP);continue;} - sprintf(fname,"%s.raw",argv[0]); + snprintf(fname,256,"%s.raw",argv[0]); f=fopen(fname,"wb"); rawhead[8]=ize.Width>>8; rawhead[9]=ize.Width&255;
--- a/loader/dshow/DS_Filter.c Mon Jun 11 12:41:53 2001 +0000 +++ b/loader/dshow/DS_Filter.c Mon Jun 11 12:47:48 2001 +0000 @@ -79,14 +79,14 @@ if (!m_iHandle) { char e[1024]; - sprintf(e, "Could not open DirectShow DLL: %s", dllname); + snprintf(e, 1024, "Could not open DirectShow DLL: %s", dllname); throw FATAL(e); } GETCLASS func=(GETCLASS)GetProcAddress(m_iHandle, "DllGetClassObject"); if (!func) { char e[1024]; - sprintf(e, "Illegal or corrupt DirectShow DLL: %s", dllname); + snprintf(e, 1024, "Illegal or corrupt DirectShow DLL: %s", dllname); throw FATAL(e); }
--- a/loader/vfl.c Mon Jun 11 12:41:53 2001 +0000 +++ b/loader/vfl.c Mon Jun 11 12:47:48 2001 +0000 @@ -121,7 +121,7 @@ memcpy(type,&fccType,4);type[4]=0; memcpy(handler,&fccHandler,4);handler[4]=0; - sprintf(codecname,"%s.%s",type,handler); + snprintf(codecname,20,"%s.%s",type,handler); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN @@ -136,7 +136,7 @@ /* if (!hdrv) { if (!strcasecmp(type,"vids")) { - sprintf(codecname,"vidc.%s",handler); + snprintf(codecname,20,"vidc.%s",handler); fccType = mmioFOURCC('v','i','d','c'); } // hdrv=OpenDriverA(codecname,"drivers32",(long)&icopen);
--- a/loader/win32.c Mon Jun 11 12:41:53 2001 +0000 +++ b/loader/win32.c Mon Jun 11 12:47:48 2001 +0000 @@ -771,7 +771,7 @@ } } /* set the CPU type of the current processor */ - sprintf(buf,"CPU %ld",cachedsi.dwProcessorType); + snprintf(buf,20,"CPU %ld",cachedsi.dwProcessorType); continue; } /* old 2.0 method */ @@ -798,7 +798,7 @@ } } /* set the CPU type of the current processor */ - sprintf(buf,"CPU %ld",cachedsi.dwProcessorType); + snprintf(buf,20,"CPU %ld",cachedsi.dwProcessorType); continue; } if (!lstrncmpiA(line,"fdiv_bug",strlen("fdiv_bug"))) { @@ -824,7 +824,7 @@ /* Create a new processor subkey on a multiprocessor * system */ - sprintf(buf,"%d",x); + snprintf(buf,20,"%d",x); } if (!lstrncmpiA(line,"stepping",strlen("stepping"))) { int x;