From 17a8a234ffabf7357d79e0e794c7ebb101ae2659 Mon Sep 17 00:00:00 2001
From: al3x <al3x@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 11 Jun 2001 12:47:48 +0000
Subject: some possible buffer overflow places fixed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1097 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 TOOLS/asfinfo.c          | 2 +-
 TOOLS/png2raw.c          | 2 +-
 loader/dshow/DS_Filter.c | 4 ++--
 loader/vfl.c             | 4 ++--
 loader/win32.c           | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TOOLS/asfinfo.c b/TOOLS/asfinfo.c
index 3e26bfe18a..ab29aa865f 100644
--- a/TOOLS/asfinfo.c
+++ b/TOOLS/asfinfo.c
@@ -231,7 +231,7 @@ while(fread(&objh,sizeof(objh),1,f)>0){
 #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]);
diff --git a/TOOLS/png2raw.c b/TOOLS/png2raw.c
index dfbbf58486..935811775c 100644
--- a/TOOLS/png2raw.c
+++ b/TOOLS/png2raw.c
@@ -162,7 +162,7 @@ while(argc>1){
   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;
diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c
index 966b2cde87..d3a530ddb4 100644
--- a/loader/dshow/DS_Filter.c
+++ b/loader/dshow/DS_Filter.c
@@ -79,14 +79,14 @@ void DS_Filter::Create(char*  dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM
 	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);
 	}
 
diff --git a/loader/vfl.c b/loader/vfl.c
index 19d12c0e44..6af2d42bc1 100644
--- a/loader/vfl.c
+++ b/loader/vfl.c
@@ -121,7 +121,7 @@ ICOpen(long fccType,long fccHandler,unsigned int wMode) {
 	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 @@ ICOpen(long fccType,long fccHandler,unsigned int wMode) {
 /*
 	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);
diff --git a/loader/win32.c b/loader/win32.c
index 323c99b1ad..4b06552570 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -771,7 +771,7 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si)
 				}
 			}
 			/* 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 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si)
 				}
 			}
 			/* 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 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si)
 			/* 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;
-- 
cgit v1.2.3