luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PhotoRec: fix file_rename() and file_rename_unicode() to allocate space for new file instead of using stack, add fallback if renamed failed

Browse source
This commit is contained in:
Christophe Grenier 2011-03-25 14:40:35 +01:00
parent 7a255f731a
commit c2164967bd
1 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/filegen.c
View file

@ -348,11 +348,19 @@ file_stat_t * init_file_stats(file_enable_t *files_enable)
void file_rename(const char *old_filename, const unsigned char *buffer, const int buffer_size, const int offset, const char *new_ext, const int force_ext) void file_rename(const char *old_filename, const unsigned char *buffer, const int buffer_size, const int offset, const char *new_ext, const int force_ext)
{ {
/* new_filename is large enough to avoid a buffer overflow */ /* new_filename is large enough to avoid a buffer overflow */
char new_filename[2048]; char *new_filename;
const char *src=old_filename; const char *src=old_filename;
const char *ext=src; const char *ext=src;
char *dst=&new_filename[0]; char *dst;
char *directory_sep=dst; char *directory_sep;
int len=strlen(old_filename)+1;
if(offset < buffer_size && buffer!=NULL)
len+=buffer_size-offset+1;
if(new_ext!=NULL)
len+=strlen(new_ext);
new_filename=(char*)MALLOC(len);
dst=new_filename;
directory_sep=new_filename;
while(*src!='\0') while(*src!='\0')
{ {
if(*src=='/') if(*src=='/')
@ -391,9 +399,10 @@ void file_rename(const char *old_filename, const unsigned char *buffer, const in
/* Add extension */ /* Add extension */
if(new_ext!=NULL) if(new_ext!=NULL)
{ {
src=new_ext;
*dst++ = '.'; *dst++ = '.';
while(*new_ext!='\0') while(*src!='\0')
*dst++ = *new_ext++; *dst++ = *src++;
} }
else if(force_ext>0) else if(force_ext>0)
{ {
@ -401,18 +410,32 @@ void file_rename(const char *old_filename, const unsigned char *buffer, const in
*dst++ = *ext++; *dst++ = *ext++;
} }
*dst='\0'; *dst='\0';
rename(old_filename, new_filename); if(rename(old_filename, new_filename)<0)
{
/* Rename has failed, try without the original filename */
if(buffer!=NULL)
file_rename(old_filename, NULL, 0, 0, new_ext, force_ext);
}
free(new_filename);
} }
/* The original filename begins at offset in buffer and is null terminated */ /* The original filename begins at offset in buffer and is null terminated */
void file_rename_unicode(const char *old_filename, const unsigned char *buffer, const int buffer_size, const int offset, const char *new_ext, const int force_ext) void file_rename_unicode(const char *old_filename, const unsigned char *buffer, const int buffer_size, const int offset, const char *new_ext, const int force_ext)
{ {
/* new_filename is large enough to avoid a buffer overflow */ /* new_filename is large enough to avoid a buffer overflow */
char new_filename[2048]; char *new_filename;
const char *src=old_filename; const char *src=old_filename;
const char *ext=src; const char *ext=src;
char *dst=&new_filename[0]; char *dst;
char *directory_sep=dst; char *directory_sep;
int len=strlen(old_filename)+1;
if(offset < buffer_size && buffer!=NULL)
len+=buffer_size-offset;
if(new_ext!=NULL)
len+=strlen(new_ext);
new_filename=(char*)MALLOC(len);
dst=new_filename;
directory_sep=dst;
while(*src!='\0') while(*src!='\0')
{ {
if(*src=='/') if(*src=='/')
@ -451,8 +474,10 @@ void file_rename_unicode(const char *old_filename, const unsigned char *buffer,
/* Add extension */ /* Add extension */
if(new_ext!=NULL) if(new_ext!=NULL)
{ {
while(*new_ext!='\0') src=new_ext;
*dst++ = *new_ext++; *dst++ = '.';
while(*src!='\0')
*dst++ = *src++;
} }
else if(force_ext>0) else if(force_ext>0)
{ {
@ -460,5 +485,11 @@ void file_rename_unicode(const char *old_filename, const unsigned char *buffer,
*dst++ = *ext++; *dst++ = *ext++;
} }
*dst='\0'; *dst='\0';
rename(old_filename, new_filename); if(rename(old_filename, new_filename)<0)
{
/* Rename has failed, try without the original filename */
if(buffer!=NULL)
file_rename_unicode(old_filename, NULL, 0, 0, new_ext, force_ext);
}
free(new_filename);
} }