RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the segfault with long filenames. Also prevent some other buffer 

overflow and turn most declarations to static.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10816 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-09-05 15:31:32 +00:00
parent 112e0a35f1
commit 24f9af3405
1 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
unrarlib.c
View File

@ -293,69 +293,69 @@ struct NewMainArchiveHeader NewMhd;
struct NewFileHeader NewLhd; struct NewFileHeader NewLhd;
struct BlockHeader BlockHead; struct BlockHeader BlockHead;
UBYTE *TempMemory = NULL; /* temporary unpack-buffer */ static UBYTE *TempMemory = NULL; /* temporary unpack-buffer */
char *CommMemory = NULL; static char *CommMemory = NULL;
UBYTE *UnpMemory = NULL; static UBYTE *UnpMemory = NULL;
char ArgName[NM]; /* current file in rar archive */ static char* ArgName = NULL; /* current file in rar archive */
char ArcFileName[NM]; /* file to decompress */ static char* ArcFileName = NULL; /* file to decompress */
#ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION /* mem-to-mem decompression */ #ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION /* mem-to-mem decompression */
MemoryFile *MemRARFile; /* pointer to RAR file in memory*/ static MemoryFile *MemRARFile; /* pointer to RAR file in memory*/
#else #else
char ArcName[255]; /* RAR archive name */ static char* ArcName = NULL; /* RAR archive name */
FILE *ArcPtr; /* input RAR file handler */ static FILE *ArcPtr; /* input RAR file handler */
#endif #endif
char Password[255]; /* password to decrypt files */ static char *Password = NULL; /* password to decrypt files */
unsigned char *temp_output_buffer; /* extract files to this pointer*/ static unsigned char *temp_output_buffer; /* extract files to this pointer*/
unsigned long *temp_output_buffer_offset; /* size of temp. extract buffer */ static unsigned long *temp_output_buffer_offset; /* size of temp. extract buffer */
BOOL FileFound; /* TRUE=use current extracted */ static BOOL FileFound; /* TRUE=use current extracted */
/* data FALSE=throw data away, */ /* data FALSE=throw data away, */
/* wrong file */ /* wrong file */
int MainHeadSize; static int MainHeadSize;
long CurBlockPos,NextBlockPos; static long CurBlockPos,NextBlockPos;
unsigned long CurUnpRead, CurUnpWrite; static unsigned long CurUnpRead, CurUnpWrite;
long UnpPackedSize; static long UnpPackedSize;
long DestUnpSize; static long DestUnpSize;
UDWORD HeaderCRC; static UDWORD HeaderCRC;
int Encryption; static int Encryption;
unsigned int UnpWrSize; //static unsigned int UnpWrSize;
unsigned char *UnpWrAddr; //static unsigned char *UnpWrAddr;
unsigned int UnpPtr,WrPtr; static unsigned int UnpPtr,WrPtr;
unsigned char PN1,PN2,PN3; static unsigned char PN1,PN2,PN3;
unsigned short OldKey[4]; static unsigned short OldKey[4];
/* function header definitions */ /* function header definitions */
int ReadHeader(int BlockType); static int ReadHeader(int BlockType);
BOOL ExtrFile(void); static BOOL ExtrFile(void);
BOOL ListFile(void); //BOOL ListFile(void);
int tread(void *stream,void *buf,unsigned len); static int tread(void *stream,void *buf,unsigned len);
int tseek(void *stream,long offset,int fromwhere); static int tseek(void *stream,long offset,int fromwhere);
BOOL UnstoreFile(void); static BOOL UnstoreFile(void);
int IsArchive(void); static int IsArchive(void);
int ReadBlock(int BlockType); static int ReadBlock(int BlockType);
unsigned int UnpRead(unsigned char *Addr,unsigned int Count); static unsigned int UnpRead(unsigned char *Addr,unsigned int Count);
void UnpInitData(void); static void UnpInitData(void);
void Unpack(unsigned char *UnpAddr); static void Unpack(unsigned char *UnpAddr);
UBYTE DecodeAudio(int Delta); static UBYTE DecodeAudio(int Delta);
static void DecodeNumber(struct Decode *Dec); static void DecodeNumber(struct Decode *Dec);
void UpdKeys(UBYTE *Buf); static void UpdKeys(UBYTE *Buf);
void SetCryptKeys(char *Password); static void SetCryptKeys(char *Password);
void SetOldKeys(char *Password); static void SetOldKeys(char *Password);
void DecryptBlock(unsigned char *Buf); static void DecryptBlock(unsigned char *Buf);
void InitCRC(void); static void InitCRC(void);
UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size); static UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size);
void UnpReadBuf(int FirstBuf); static void UnpReadBuf(int FirstBuf);
void ReadTables(void); static void ReadTables(void);
static void ReadLastTables(void); static void ReadLastTables(void);
static void MakeDecodeTables(unsigned char *LenTab, static void MakeDecodeTables(unsigned char *LenTab,
struct Decode *Dec, struct Decode *Dec,
@ -393,14 +393,19 @@ int urarlib_get(void *output,
InitCRC(); /* init some vars */ InitCRC(); /* init some vars */
strcpy(ArgName, filename); /* set file(s) to extract */ if(ArgName) free(ArgName);
ArgName = strdup(filename); /* set file(s) to extract */
#ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION #ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION
MemRARFile = rarfile; /* set pointer to mem-RAR file */ MemRARFile = rarfile; /* set pointer to mem-RAR file */
#else #else
strcpy(ArcName, rarfile); /* set RAR file name */ if(ArcName) free(ArcName);
ArcName = strdup(rarfile); /* set RAR file name */
#endif #endif
if(Password) free(Password);
if(libpassword != NULL) if(libpassword != NULL)
strcpy(Password, libpassword); /* init password */ Password = strdup(libpassword); /* init password */
else
Password = strdup("");
temp_output_buffer = NULL; temp_output_buffer = NULL;
temp_output_buffer_offset=size; /* set size of the temp buffer */ temp_output_buffer_offset=size; /* set size of the temp buffer */
@ -413,7 +418,7 @@ int urarlib_get(void *output,
retcode = ExtrFile(); /* unpack file now! */ retcode = ExtrFile(); /* unpack file now! */
memset(Password,0,sizeof(Password)); /* clear password */ //memset(Password,0,sizeof(Password)); /* clear password */
#ifndef _USE_MEMORY_TO_MEMORY_DECOMPRESSION #ifndef _USE_MEMORY_TO_MEMORY_DECOMPRESSION
if (ArcPtr!=NULL){ if (ArcPtr!=NULL){
@ -1578,7 +1583,7 @@ unsigned int UnpRead(unsigned char *Addr,unsigned int Count)
while (Count > 0) while (Count > 0)
{ {
ReadSize=(unsigned int)((Count>(unsigned long)UnpPackedSize) ? ReadSize=(unsigned int)((Count>(unsigned long)UnpPackedSize) ?
UnpPackedSize : Count); (unsigned int)UnpPackedSize : Count);
#ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION #ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION
if(MemRARFile->data == NULL) if(MemRARFile->data == NULL)
return(0); return(0);