openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 09:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/ : Make string storage dynamically allocated.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2012-02-19 22:27:02 +11:00
parent dabdc133d0
commit 3ecaecd9f9
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* tests/string_test.c
Fix valgrind warnings.
* src/common.h src/sndfile.c src/strings.c
Make string storage dynamically allocated.
2012-02-18 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/wav.c

3
src/common.h
View File

@ -366,7 +366,8 @@ typedef struct sf_private_tag
*/
struct
{ STR_DATA data [SF_MAX_STRINGS] ;
char storage [SF_STR_BUFFER_LEN] ;
char *storage ;
size_t storage_len ;
uint32_t str_last ;
uint32_t flags ;
} strings ;

1
src/sndfile.c
View File

@ -2565,6 +2565,7 @@ psf_close (SF_PRIVATE *psf)
free (psf->instrument) ;
free (psf->channel_map) ;
free (psf->format_desc) ;
free (psf->strings.storage) ;
if (psf->wchunks.chunks)
for (k = 0 ; k < psf->wchunks.used ; k++)

27
src/strings.c
View File

@ -33,7 +33,7 @@ static void hexdump (void *data, int len) ;
int
psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
{ char new_str [128] ;
size_t len_remaining, str_len ;
size_t str_len ;
int k, str_flags ;
if (str == NULL)
@ -41,6 +41,11 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
str_len = strlen (str) ;
if (psf->strings.storage == NULL)
{ psf->strings.storage_len = 2 * str_len ;
psf->strings.storage = malloc (psf->strings.storage_len) ;
} ;
/* A few extra checks for write mode. */
if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
{ if ((psf->strings.flags & SF_STR_ALLOW_START) == 0)
@ -127,10 +132,17 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
str_len = strlen (str) ;
len_remaining = SIGNED_SIZEOF (psf->strings.storage) - psf->strings.str_last ;
if (psf->strings.str_last + str_len + 2 > psf->strings.storage_len)
{ char * temp = psf->strings.storage ;
size_t newlen = 2 * psf->strings.storage_len + str_len ;
if (len_remaining < str_len + 2)
return SFE_STR_MAX_DATA ;
if ((psf->strings.storage = realloc (temp, newlen)) == NULL)
{ psf->strings.storage = temp ;
return SFE_MALLOC_FAILED ;
} ;
psf->strings.storage_len = newlen ;
} ;
psf->strings.data [k].type = str_type ;
psf->strings.data [k].str = psf->strings.storage + psf->strings.str_last ;
@ -143,11 +155,10 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
psf->strings.flags |= str_flags ;
#if STRINGS_DEBUG
psf_log_printf (psf, "str_storage : %X\n", (int) psf->strings.storage) ;
psf_log_printf (psf, "str_last : %d\n", (int) psf->strings.str_last) ;
psf_log_printf (psf, "sizeof (str_storage) : %d\n", SIGNED_SIZEOF (psf->strings.storage)) ;
psf_log_printf (psf, "str_storage : %p\n", psf->strings.storage) ;
psf_log_printf (psf, "str_last : %u\n", psf->strings.str_last) ;
psf_log_printf (psf, "used : %d\n", psf->strings.str_last) ;
psf_log_printf (psf, "remaining : %d\n", SIGNED_SIZEOF (psf->strings.storage) - psf->strings.str_last) ;
psf_log_printf (psf, "remaining : %d\n", psf->strings.storage_len - psf->strings.str_last ;
hexdump (psf->strings.storage, 300) ;
#endif