Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stefan Strogin
flac
Commits
6c2040dc
Commit
6c2040dc
authored
Apr 04, 2012
by
Erik de Castro Lopo
Browse files
Remove casting of return value from *alloc() functions.
parent
afedee12
Changes
25
Hide whitespace changes
Inline
Side-by-side
src/flac/foreign_metadata.c
View file @
6c2040dc
...
...
@@ -682,7 +682,7 @@ static FLAC__bool write_to_iff_(foreign_metadata_t *fm, FILE *fin, FILE *fout, o
foreign_metadata_t
*
flac__foreign_metadata_new
(
foreign_block_type_t
type
)
{
/* calloc() to zero all the member variables */
foreign_metadata_t
*
x
=
(
foreign_metadata_t
*
)
calloc
(
sizeof
(
foreign_metadata_t
),
1
);
foreign_metadata_t
*
x
=
calloc
(
sizeof
(
foreign_metadata_t
),
1
);
if
(
x
)
{
x
->
type
=
type
;
x
->
is_rf64
=
false
;
...
...
src/flac/main.c
View file @
6c2040dc
...
...
@@ -638,7 +638,7 @@ int parse_options(int argc, char *argv[])
if
(
option_values
.
num_files
>
0
)
{
unsigned
i
=
0
;
if
(
0
==
(
option_values
.
filenames
=
(
char
**
)
malloc
(
sizeof
(
char
*
)
*
option_values
.
num_files
)))
if
(
0
==
(
option_values
.
filenames
=
malloc
(
sizeof
(
char
*
)
*
option_values
.
num_files
)))
die
(
"out of memory allocating space for file names list"
);
while
(
share__optind
<
argc
)
option_values
.
filenames
[
i
++
]
=
local_strdup
(
argv
[
share__optind
++
]);
...
...
@@ -1896,7 +1896,7 @@ int encode_file(const char *infilename, FLAC__bool is_first_file, FLAC__bool is_
if
(
encode_infile
!=
stdin
&&
grabbag__file_are_same
(
infilename
,
outfilename
))
{
static
const
char
*
tmp_suffix
=
".tmp,fl-ac+en'c"
;
/*@@@@ still a remote possibility that a file with this filename exists */
if
(
0
==
(
internal_outfilename
=
(
char
*
)
safe_malloc_add_3op_
(
strlen
(
outfilename
),
/*+*/
strlen
(
tmp_suffix
),
/*+*/
1
)))
{
if
(
0
==
(
internal_outfilename
=
safe_malloc_add_3op_
(
strlen
(
outfilename
),
/*+*/
strlen
(
tmp_suffix
),
/*+*/
1
)))
{
flac__utils_printf
(
stderr
,
1
,
"ERROR allocating memory for tempfile name
\n
"
);
conditional_fclose
(
encode_infile
);
return
1
;
...
...
src/libFLAC/bitreader.c
View file @
6c2040dc
...
...
@@ -259,7 +259,7 @@ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
FLAC__BitReader
*
FLAC__bitreader_new
(
void
)
{
FLAC__BitReader
*
br
=
(
FLAC__BitReader
*
)
calloc
(
1
,
sizeof
(
FLAC__BitReader
));
FLAC__BitReader
*
br
=
calloc
(
1
,
sizeof
(
FLAC__BitReader
));
/* calloc() implies:
memset(br, 0, sizeof(FLAC__BitReader));
...
...
@@ -294,7 +294,7 @@ FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__CPUInfo cpu, FLAC__Bi
br
->
words
=
br
->
bytes
=
0
;
br
->
consumed_words
=
br
->
consumed_bits
=
0
;
br
->
capacity
=
FLAC__BITREADER_DEFAULT_CAPACITY
;
br
->
buffer
=
(
uint32_t
*
)
malloc
(
sizeof
(
uint32_t
)
*
br
->
capacity
);
br
->
buffer
=
malloc
(
sizeof
(
uint32_t
)
*
br
->
capacity
);
if
(
br
->
buffer
==
0
)
return
false
;
br
->
read_callback
=
rcb
;
...
...
src/libFLAC/bitwriter.c
View file @
6c2040dc
...
...
@@ -118,7 +118,7 @@ static FLAC__bool bitwriter_grow_(FLAC__BitWriter *bw, unsigned bits_to_add)
FLAC__ASSERT
(
new_capacity
>
bw
->
capacity
);
FLAC__ASSERT
(
new_capacity
>=
bw
->
words
+
((
bw
->
bits
+
bits_to_add
+
FLAC__BITS_PER_WORD
-
1
)
/
FLAC__BITS_PER_WORD
));
new_buffer
=
(
bwword
*
)
safe_realloc_mul_2op_
(
bw
->
buffer
,
sizeof
(
bwword
),
/*times*/
new_capacity
);
new_buffer
=
safe_realloc_mul_2op_
(
bw
->
buffer
,
sizeof
(
bwword
),
/*times*/
new_capacity
);
if
(
new_buffer
==
0
)
return
false
;
bw
->
buffer
=
new_buffer
;
...
...
@@ -135,7 +135,7 @@ static FLAC__bool bitwriter_grow_(FLAC__BitWriter *bw, unsigned bits_to_add)
FLAC__BitWriter
*
FLAC__bitwriter_new
(
void
)
{
FLAC__BitWriter
*
bw
=
(
FLAC__BitWriter
*
)
calloc
(
1
,
sizeof
(
FLAC__BitWriter
));
FLAC__BitWriter
*
bw
=
calloc
(
1
,
sizeof
(
FLAC__BitWriter
));
/* note that calloc() sets all members to 0 for us */
return
bw
;
}
...
...
@@ -160,7 +160,7 @@ FLAC__bool FLAC__bitwriter_init(FLAC__BitWriter *bw)
bw
->
words
=
bw
->
bits
=
0
;
bw
->
capacity
=
FLAC__BITWRITER_DEFAULT_CAPACITY
;
bw
->
buffer
=
(
bwword
*
)
malloc
(
sizeof
(
bwword
)
*
bw
->
capacity
);
bw
->
buffer
=
malloc
(
sizeof
(
bwword
)
*
bw
->
capacity
);
if
(
bw
->
buffer
==
0
)
return
false
;
...
...
src/libFLAC/format.c
View file @
6c2040dc
...
...
@@ -587,9 +587,9 @@ FLAC__bool FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_s
FLAC__ASSERT
(
object
->
capacity_by_order
>
0
||
(
0
==
object
->
parameters
&&
0
==
object
->
raw_bits
));
if
(
object
->
capacity_by_order
<
max_partition_order
)
{
if
(
0
==
(
object
->
parameters
=
(
unsigned
*
)
realloc
(
object
->
parameters
,
sizeof
(
unsigned
)
*
(
1
<<
max_partition_order
))))
if
(
0
==
(
object
->
parameters
=
realloc
(
object
->
parameters
,
sizeof
(
unsigned
)
*
(
1
<<
max_partition_order
))))
return
false
;
if
(
0
==
(
object
->
raw_bits
=
(
unsigned
*
)
realloc
(
object
->
raw_bits
,
sizeof
(
unsigned
)
*
(
1
<<
max_partition_order
))))
if
(
0
==
(
object
->
raw_bits
=
realloc
(
object
->
raw_bits
,
sizeof
(
unsigned
)
*
(
1
<<
max_partition_order
))))
return
false
;
memset
(
object
->
raw_bits
,
0
,
sizeof
(
unsigned
)
*
(
1
<<
max_partition_order
));
object
->
capacity_by_order
=
max_partition_order
;
...
...
src/libFLAC/md5.c
View file @
6c2040dc
...
...
@@ -139,7 +139,7 @@ static void byteSwap(FLAC__uint32 *buf, unsigned words)
{
register
FLAC__uint32
x
;
do
{
x
=
*
buf
;
x
=
*
buf
;
x
=
((
x
<<
8
)
&
0xff00ff00
)
|
((
x
>>
8
)
&
0x00ff00ff
);
*
buf
++
=
(
x
>>
16
)
|
(
x
<<
16
);
}
while
(
--
words
);
...
...
@@ -402,10 +402,10 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const
return
false
;
if
(
ctx
->
capacity
<
bytes_needed
)
{
FLAC__byte
*
tmp
=
(
FLAC__byte
*
)
realloc
(
ctx
->
internal_buf
,
bytes_needed
);
FLAC__byte
*
tmp
=
realloc
(
ctx
->
internal_buf
,
bytes_needed
);
if
(
0
==
tmp
)
{
free
(
ctx
->
internal_buf
);
if
(
0
==
(
ctx
->
internal_buf
=
(
FLAC__byte
*
)
safe_malloc_
(
bytes_needed
)))
if
(
0
==
(
ctx
->
internal_buf
=
safe_malloc_
(
bytes_needed
)))
return
false
;
}
else
...
...
src/libFLAC/memory.c
View file @
6c2040dc
...
...
@@ -87,7 +87,7 @@ FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 *
if
(
elements
>
SIZE_MAX
/
sizeof
(
*
pu
))
/* overflow check */
return
false
;
pu
=
(
FLAC__int32
*
)
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
pu
=
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
if
(
0
==
pu
)
{
return
false
;
}
...
...
@@ -116,7 +116,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32
if
(
elements
>
SIZE_MAX
/
sizeof
(
*
pu
))
/* overflow check */
return
false
;
pu
=
(
FLAC__uint32
*
)
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
pu
=
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
if
(
0
==
pu
)
{
return
false
;
}
...
...
@@ -145,7 +145,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64
if
(
elements
>
SIZE_MAX
/
sizeof
(
*
pu
))
/* overflow check */
return
false
;
pu
=
(
FLAC__uint64
*
)
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
pu
=
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
if
(
0
==
pu
)
{
return
false
;
}
...
...
@@ -174,7 +174,7 @@ FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned *
if
(
elements
>
SIZE_MAX
/
sizeof
(
*
pu
))
/* overflow check */
return
false
;
pu
=
(
unsigned
*
)
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
pu
=
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
if
(
0
==
pu
)
{
return
false
;
}
...
...
@@ -205,7 +205,7 @@ FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **u
if
(
elements
>
SIZE_MAX
/
sizeof
(
*
pu
))
/* overflow check */
return
false
;
pu
=
(
FLAC__real
*
)
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
pu
=
FLAC__memory_alloc_aligned
(
sizeof
(
*
pu
)
*
elements
,
&
u
.
pv
);
if
(
0
==
pu
)
{
return
false
;
}
...
...
src/libFLAC/metadata_iterators.c
View file @
6c2040dc
...
...
@@ -374,7 +374,7 @@ FLAC_API const char * const FLAC__Metadata_SimpleIteratorStatusString[] = {
FLAC_API
FLAC__Metadata_SimpleIterator
*
FLAC__metadata_simple_iterator_new
(
void
)
{
FLAC__Metadata_SimpleIterator
*
iterator
=
(
FLAC__Metadata_SimpleIterator
*
)
calloc
(
1
,
sizeof
(
FLAC__Metadata_SimpleIterator
));
FLAC__Metadata_SimpleIterator
*
iterator
=
calloc
(
1
,
sizeof
(
FLAC__Metadata_SimpleIterator
));
if
(
0
!=
iterator
)
{
iterator
->
file
=
0
;
...
...
@@ -940,7 +940,7 @@ FLAC_API const char * const FLAC__Metadata_ChainStatusString[] = {
static
FLAC__Metadata_Node
*
node_new_
(
void
)
{
return
(
FLAC__Metadata_Node
*
)
calloc
(
1
,
sizeof
(
FLAC__Metadata_Node
));
return
calloc
(
1
,
sizeof
(
FLAC__Metadata_Node
));
}
static
void
node_delete_
(
FLAC__Metadata_Node
*
node
)
...
...
@@ -1496,7 +1496,7 @@ static FLAC__bool chain_rewrite_file_cb_(FLAC__Metadata_Chain *chain, FLAC__IOHa
FLAC_API
FLAC__Metadata_Chain
*
FLAC__metadata_chain_new
(
void
)
{
FLAC__Metadata_Chain
*
chain
=
(
FLAC__Metadata_Chain
*
)
calloc
(
1
,
sizeof
(
FLAC__Metadata_Chain
));
FLAC__Metadata_Chain
*
chain
=
calloc
(
1
,
sizeof
(
FLAC__Metadata_Chain
));
if
(
0
!=
chain
)
chain_init_
(
chain
);
...
...
@@ -1831,7 +1831,7 @@ FLAC_API void FLAC__metadata_chain_sort_padding(FLAC__Metadata_Chain *chain)
FLAC_API
FLAC__Metadata_Iterator
*
FLAC__metadata_iterator_new
(
void
)
{
FLAC__Metadata_Iterator
*
iterator
=
(
FLAC__Metadata_Iterator
*
)
calloc
(
1
,
sizeof
(
FLAC__Metadata_Iterator
));
FLAC__Metadata_Iterator
*
iterator
=
calloc
(
1
,
sizeof
(
FLAC__Metadata_Iterator
));
/* calloc() implies:
iterator->current = 0;
...
...
@@ -2167,7 +2167,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_application_cb_(FLA
block
->
data
=
0
;
}
else
{
if
(
0
==
(
block
->
data
=
(
FLAC__byte
*
)
malloc
(
block_length
)))
if
(
0
==
(
block
->
data
=
malloc
(
block_length
)))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
if
(
read_cb
(
block
->
data
,
1
,
block_length
,
handle
)
!=
block_length
)
...
...
@@ -2188,7 +2188,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_seektable_cb_(FLAC_
if
(
block
->
num_points
==
0
)
block
->
points
=
0
;
else
if
(
0
==
(
block
->
points
=
(
FLAC__StreamMetadata_SeekPoint
*
)
safe_malloc_mul_2op_
(
block
->
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
))))
else
if
(
0
==
(
block
->
points
=
safe_malloc_mul_2op_
(
block
->
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
))))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
for
(
i
=
0
;
i
<
block
->
num_points
;
i
++
)
{
...
...
@@ -2221,7 +2221,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entr
entry
->
entry
=
0
;
}
else
{
if
(
0
==
(
entry
->
entry
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
entry
->
length
,
/*+*/
1
)))
if
(
0
==
(
entry
->
entry
=
safe_malloc_add_2op_
(
entry
->
length
,
/*+*/
1
)))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
if
(
read_cb
(
entry
->
entry
,
1
,
entry
->
length
,
handle
)
!=
entry
->
length
)
...
...
@@ -2252,7 +2252,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_(
if
(
block
->
num_comments
==
0
)
{
block
->
comments
=
0
;
}
else
if
(
0
==
(
block
->
comments
=
(
FLAC__StreamMetadata_VorbisComment_Entry
*
)
calloc
(
block
->
num_comments
,
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
))))
else
if
(
0
==
(
block
->
comments
=
calloc
(
block
->
num_comments
,
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
))))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
for
(
i
=
0
;
i
<
block
->
num_comments
;
i
++
)
{
...
...
@@ -2307,7 +2307,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_track_cb_(
if
(
track
->
num_indices
==
0
)
{
track
->
indices
=
0
;
}
else
if
(
0
==
(
track
->
indices
=
(
FLAC__StreamMetadata_CueSheet_Index
*
)
calloc
(
track
->
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
else
if
(
0
==
(
track
->
indices
=
calloc
(
track
->
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
for
(
i
=
0
;
i
<
track
->
num_indices
;
i
++
)
{
...
...
@@ -2367,7 +2367,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_cb_(FLAC__
if
(
block
->
num_tracks
==
0
)
{
block
->
tracks
=
0
;
}
else
if
(
0
==
(
block
->
tracks
=
(
FLAC__StreamMetadata_CueSheet_Track
*
)
calloc
(
block
->
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
))))
else
if
(
0
==
(
block
->
tracks
=
calloc
(
block
->
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
))))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
for
(
i
=
0
;
i
<
block
->
num_tracks
;
i
++
)
{
...
...
@@ -2396,7 +2396,7 @@ static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_picture_cstr
if
(
0
!=
*
data
)
free
(
*
data
);
if
(
0
==
(
*
data
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
*
length
,
/*+*/
1
)))
if
(
0
==
(
*
data
=
safe_malloc_add_2op_
(
*
length
,
/*+*/
1
)))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
if
(
*
length
>
0
)
{
...
...
@@ -2470,7 +2470,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_unknown_cb_(FLAC__I
block
->
data
=
0
;
}
else
{
if
(
0
==
(
block
->
data
=
(
FLAC__byte
*
)
malloc
(
block_length
)))
if
(
0
==
(
block
->
data
=
malloc
(
block_length
)))
return
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
if
(
read_cb
(
block
->
data
,
1
,
block_length
,
handle
)
!=
block_length
)
...
...
@@ -3215,7 +3215,7 @@ FLAC__bool open_tempfile_(const char *filename, const char *tempfile_path_prefix
{
static
const
char
*
tempfile_suffix
=
".metadata_edit"
;
if
(
0
==
tempfile_path_prefix
)
{
if
(
0
==
(
*
tempfilename
=
(
char
*
)
safe_malloc_add_3op_
(
strlen
(
filename
),
/*+*/
strlen
(
tempfile_suffix
),
/*+*/
1
)))
{
if
(
0
==
(
*
tempfilename
=
safe_malloc_add_3op_
(
strlen
(
filename
),
/*+*/
strlen
(
tempfile_suffix
),
/*+*/
1
)))
{
*
status
=
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -3229,7 +3229,7 @@ FLAC__bool open_tempfile_(const char *filename, const char *tempfile_path_prefix
else
p
++
;
if
(
0
==
(
*
tempfilename
=
(
char
*
)
safe_malloc_add_4op_
(
strlen
(
tempfile_path_prefix
),
/*+*/
strlen
(
p
),
/*+*/
strlen
(
tempfile_suffix
),
/*+*/
2
)))
{
if
(
0
==
(
*
tempfilename
=
safe_malloc_add_4op_
(
strlen
(
tempfile_path_prefix
),
/*+*/
strlen
(
p
),
/*+*/
strlen
(
tempfile_suffix
),
/*+*/
2
)))
{
*
status
=
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
src/libFLAC/metadata_object.c
View file @
6c2040dc
...
...
@@ -61,7 +61,7 @@ static FLAC__bool copy_bytes_(FLAC__byte **to, const FLAC__byte *from, unsigned
FLAC__ASSERT
(
0
!=
to
);
if
(
bytes
>
0
&&
0
!=
from
)
{
FLAC__byte
*
x
;
if
(
0
==
(
x
=
(
FLAC__byte
*
)
safe_malloc_
(
bytes
)))
if
(
0
==
(
x
=
safe_malloc_
(
bytes
)))
return
false
;
memcpy
(
x
,
from
,
bytes
);
*
to
=
x
;
...
...
@@ -95,7 +95,7 @@ static FLAC__bool free_copy_bytes_(FLAC__byte **to, const FLAC__byte *from, unsi
/* realloc() failure leaves entry unchanged */
static
FLAC__bool
ensure_null_terminated_
(
FLAC__byte
**
entry
,
unsigned
length
)
{
FLAC__byte
*
x
=
(
FLAC__byte
*
)
safe_realloc_add_2op_
(
*
entry
,
length
,
/*+*/
1
);
FLAC__byte
*
x
=
safe_realloc_add_2op_
(
*
entry
,
length
,
/*+*/
1
);
if
(
0
!=
x
)
{
x
[
length
]
=
'\0'
;
*
entry
=
x
;
...
...
@@ -133,7 +133,7 @@ static FLAC__bool copy_vcentry_(FLAC__StreamMetadata_VorbisComment_Entry *to, co
else
{
FLAC__byte
*
x
;
FLAC__ASSERT
(
from
->
length
>
0
);
if
(
0
==
(
x
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
from
->
length
,
/*+*/
1
)))
if
(
0
==
(
x
=
safe_malloc_add_2op_
(
from
->
length
,
/*+*/
1
)))
return
false
;
memcpy
(
x
,
from
->
entry
,
from
->
length
);
x
[
from
->
length
]
=
'\0'
;
...
...
@@ -151,7 +151,7 @@ static FLAC__bool copy_track_(FLAC__StreamMetadata_CueSheet_Track *to, const FLA
else
{
FLAC__StreamMetadata_CueSheet_Index
*
x
;
FLAC__ASSERT
(
from
->
num_indices
>
0
);
if
(
0
==
(
x
=
(
FLAC__StreamMetadata_CueSheet_Index
*
)
safe_malloc_mul_2op_
(
from
->
num_indices
,
/*times*/
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
if
(
0
==
(
x
=
safe_malloc_mul_2op_
(
from
->
num_indices
,
/*times*/
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
return
false
;
memcpy
(
x
,
from
->
indices
,
from
->
num_indices
*
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
));
to
->
indices
=
x
;
...
...
@@ -173,7 +173,7 @@ static FLAC__StreamMetadata_SeekPoint *seekpoint_array_new_(unsigned num_points)
FLAC__ASSERT
(
num_points
>
0
);
object_array
=
(
FLAC__StreamMetadata_SeekPoint
*
)
safe_malloc_mul_2op_
(
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
));
object_array
=
safe_malloc_mul_2op_
(
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
));
if
(
0
!=
object_array
)
{
unsigned
i
;
...
...
@@ -206,7 +206,7 @@ static FLAC__StreamMetadata_VorbisComment_Entry *vorbiscomment_entry_array_new_(
{
FLAC__ASSERT
(
num_comments
>
0
);
return
(
FLAC__StreamMetadata_VorbisComment_Entry
*
)
safe_calloc_
(
num_comments
,
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
));
return
safe_calloc_
(
num_comments
,
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
));
}
static
void
vorbiscomment_entry_array_delete_
(
FLAC__StreamMetadata_VorbisComment_Entry
*
object_array
,
unsigned
num_comments
)
...
...
@@ -345,14 +345,14 @@ static FLAC__StreamMetadata_CueSheet_Index *cuesheet_track_index_array_new_(unsi
{
FLAC__ASSERT
(
num_indices
>
0
);
return
(
FLAC__StreamMetadata_CueSheet_Index
*
)
safe_calloc_
(
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
));
return
safe_calloc_
(
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
));
}
static
FLAC__StreamMetadata_CueSheet_Track
*
cuesheet_track_array_new_
(
unsigned
num_tracks
)
{
FLAC__ASSERT
(
num_tracks
>
0
);
return
(
FLAC__StreamMetadata_CueSheet_Track
*
)
safe_calloc_
(
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
));
return
safe_calloc_
(
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
));
}
static
void
cuesheet_track_array_delete_
(
FLAC__StreamMetadata_CueSheet_Track
*
object_array
,
unsigned
num_tracks
)
...
...
@@ -437,7 +437,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type
if
(
type
>
FLAC__MAX_METADATA_TYPE_CODE
)
return
0
;
object
=
(
FLAC__StreamMetadata
*
)
calloc
(
1
,
sizeof
(
FLAC__StreamMetadata
));
object
=
calloc
(
1
,
sizeof
(
FLAC__StreamMetadata
));
if
(
0
!=
object
)
{
object
->
is_last
=
false
;
object
->
type
=
type
;
...
...
@@ -952,7 +952,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMe
free
(
object
->
data
.
seek_table
.
points
);
object
->
data
.
seek_table
.
points
=
0
;
}
else
if
(
0
==
(
object
->
data
.
seek_table
.
points
=
(
FLAC__StreamMetadata_SeekPoint
*
)
realloc
(
object
->
data
.
seek_table
.
points
,
new_size
)))
else
if
(
0
==
(
object
->
data
.
seek_table
.
points
=
realloc
(
object
->
data
.
seek_table
.
points
,
new_size
)))
return
false
;
/* if growing, set new elements to placeholders */
...
...
@@ -1191,7 +1191,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__St
free
(
object
->
data
.
vorbis_comment
.
comments
);
object
->
data
.
vorbis_comment
.
comments
=
0
;
}
else
if
(
0
==
(
object
->
data
.
vorbis_comment
.
comments
=
(
FLAC__StreamMetadata_VorbisComment_Entry
*
)
realloc
(
object
->
data
.
vorbis_comment
.
comments
,
new_size
)))
else
if
(
0
==
(
object
->
data
.
vorbis_comment
.
comments
=
realloc
(
object
->
data
.
vorbis_comment
.
comments
,
new_size
)))
return
false
;
/* if growing, zero all the length/pointers of new elements */
...
...
@@ -1328,7 +1328,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pa
const
size_t
nn
=
strlen
(
field_name
);
const
size_t
nv
=
strlen
(
field_value
);
entry
->
length
=
nn
+
1
/*=*/
+
nv
;
if
(
0
==
(
entry
->
entry
=
(
FLAC__byte
*
)
safe_malloc_add_4op_
(
nn
,
/*+*/
1
,
/*+*/
nv
,
/*+*/
1
)))
if
(
0
==
(
entry
->
entry
=
safe_malloc_add_4op_
(
nn
,
/*+*/
1
,
/*+*/
nv
,
/*+*/
1
)))
return
false
;
memcpy
(
entry
->
entry
,
field_name
,
nn
);
entry
->
entry
[
nn
]
=
'='
;
...
...
@@ -1355,9 +1355,9 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair
FLAC__ASSERT
(
0
!=
eq
);
if
(
0
==
eq
)
return
false
;
/* double protection */
if
(
0
==
(
*
field_name
=
(
char
*
)
safe_malloc_add_2op_
(
nn
,
/*+*/
1
)))
if
(
0
==
(
*
field_name
=
safe_malloc_add_2op_
(
nn
,
/*+*/
1
)))
return
false
;
if
(
0
==
(
*
field_value
=
(
char
*
)
safe_malloc_add_2op_
(
nv
,
/*+*/
1
)))
{
if
(
0
==
(
*
field_value
=
safe_malloc_add_2op_
(
nv
,
/*+*/
1
)))
{
free
(
*
field_name
);
return
false
;
}
...
...
@@ -1435,7 +1435,7 @@ FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entries_matching(FLAC__S
FLAC_API
FLAC__StreamMetadata_CueSheet_Track
*
FLAC__metadata_object_cuesheet_track_new
(
void
)
{
return
(
FLAC__StreamMetadata_CueSheet_Track
*
)
calloc
(
1
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
));
return
calloc
(
1
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
));
}
FLAC_API
FLAC__StreamMetadata_CueSheet_Track
*
FLAC__metadata_object_cuesheet_track_clone
(
const
FLAC__StreamMetadata_CueSheet_Track
*
object
)
...
...
@@ -1500,7 +1500,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__St
free
(
track
->
indices
);
track
->
indices
=
0
;
}
else
if
(
0
==
(
track
->
indices
=
(
FLAC__StreamMetadata_CueSheet_Index
*
)
realloc
(
track
->
indices
,
new_size
)))
else
if
(
0
==
(
track
->
indices
=
realloc
(
track
->
indices
,
new_size
)))
return
false
;
/* if growing, zero all the lengths/pointers of new elements */
...
...
@@ -1596,7 +1596,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMet
free
(
object
->
data
.
cue_sheet
.
tracks
);
object
->
data
.
cue_sheet
.
tracks
=
0
;
}
else
if
(
0
==
(
object
->
data
.
cue_sheet
.
tracks
=
(
FLAC__StreamMetadata_CueSheet_Track
*
)
realloc
(
object
->
data
.
cue_sheet
.
tracks
,
new_size
)))
else
if
(
0
==
(
object
->
data
.
cue_sheet
.
tracks
=
realloc
(
object
->
data
.
cue_sheet
.
tracks
,
new_size
)))
return
false
;
/* if growing, zero all the lengths/pointers of new elements */
...
...
src/libFLAC/ogg_helper.c
View file @
6c2040dc
...
...
@@ -113,7 +113,7 @@ FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 po
}
/* allocate space for the page header */
if
(
0
==
(
page
->
header
=
(
unsigned
char
*
)
safe_malloc_
(
OGG_MAX_HEADER_LEN
)))
{
if
(
0
==
(
page
->
header
=
safe_malloc_
(
OGG_MAX_HEADER_LEN
)))
{
encoder
->
protected_
->
state
=
FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -155,7 +155,7 @@ FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 po
}
/* allocate space for the page body */
if
(
0
==
(
page
->
body
=
(
unsigned
char
*
)
safe_malloc_
(
page
->
body_len
)))
{
if
(
0
==
(
page
->
body
=
safe_malloc_
(
page
->
body_len
)))
{
encoder
->
protected_
->
state
=
FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
src/libFLAC/stream_decoder.c
View file @
6c2040dc
...
...
@@ -276,18 +276,18 @@ FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void)
FLAC__ASSERT
(
sizeof
(
int
)
>=
4
);
/* we want to die right away if this is not true */
decoder
=
(
FLAC__StreamDecoder
*
)
calloc
(
1
,
sizeof
(
FLAC__StreamDecoder
));
decoder
=
calloc
(
1
,
sizeof
(
FLAC__StreamDecoder
));
if
(
decoder
==
0
)
{
return
0
;
}
decoder
->
protected_
=
(
FLAC__StreamDecoderProtected
*
)
calloc
(
1
,
sizeof
(
FLAC__StreamDecoderProtected
));
decoder
->
protected_
=
calloc
(
1
,
sizeof
(
FLAC__StreamDecoderProtected
));
if
(
decoder
->
protected_
==
0
)
{
free
(
decoder
);
return
0
;
}
decoder
->
private_
=
(
FLAC__StreamDecoderPrivate
*
)
calloc
(
1
,
sizeof
(
FLAC__StreamDecoderPrivate
));
decoder
->
private_
=
calloc
(
1
,
sizeof
(
FLAC__StreamDecoderPrivate
));
if
(
decoder
->
private_
==
0
)
{
free
(
decoder
->
protected_
);
free
(
decoder
);
...
...
@@ -303,7 +303,7 @@ FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void)
}
decoder
->
private_
->
metadata_filter_ids_capacity
=
16
;
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
(
FLAC__byte
*
)
malloc
((
FLAC__STREAM_METADATA_APPLICATION_ID_LEN
/
8
)
*
decoder
->
private_
->
metadata_filter_ids_capacity
)))
{
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
malloc
((
FLAC__STREAM_METADATA_APPLICATION_ID_LEN
/
8
)
*
decoder
->
private_
->
metadata_filter_ids_capacity
)))
{
FLAC__bitreader_delete
(
decoder
->
private_
->
input
);
free
(
decoder
->
private_
);
free
(
decoder
->
protected_
);
...
...
@@ -780,7 +780,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__
FLAC__ASSERT
(
0
!=
decoder
->
private_
->
metadata_filter_ids
);
if
(
decoder
->
private_
->
metadata_filter_ids_count
==
decoder
->
private_
->
metadata_filter_ids_capacity
)
{
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
(
FLAC__byte
*
)
safe_realloc_mul_2op_
(
decoder
->
private_
->
metadata_filter_ids
,
decoder
->
private_
->
metadata_filter_ids_capacity
,
/*times*/
2
)))
{
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
safe_realloc_mul_2op_
(
decoder
->
private_
->
metadata_filter_ids
,
decoder
->
private_
->
metadata_filter_ids_capacity
,
/*times*/
2
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -839,7 +839,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__S
FLAC__ASSERT
(
0
!=
decoder
->
private_
->
metadata_filter_ids
);
if
(
decoder
->
private_
->
metadata_filter_ids_count
==
decoder
->
private_
->
metadata_filter_ids_capacity
)
{
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
(
FLAC__byte
*
)
safe_realloc_mul_2op_
(
decoder
->
private_
->
metadata_filter_ids
,
decoder
->
private_
->
metadata_filter_ids_capacity
,
/*times*/
2
)))
{
if
(
0
==
(
decoder
->
private_
->
metadata_filter_ids
=
safe_realloc_mul_2op_
(
decoder
->
private_
->
metadata_filter_ids
,
decoder
->
private_
->
metadata_filter_ids_capacity
,
/*times*/
2
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1283,7 +1283,7 @@ FILE *get_binary_stdin_(void)
*/
#if defined _MSC_VER || defined __MINGW32__
_setmode
(
_fileno
(
stdin
),
_O_BINARY
);
#elif defined __CYGWIN__
#elif defined __CYGWIN__
/* almost certainly not needed for any modern Cygwin, but let's be safe... */
setmode
(
_fileno
(
stdin
),
_O_BINARY
);
#elif defined __EMX__
...
...
@@ -1321,7 +1321,7 @@ FLAC__bool allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigne
* (at negative indices) for alignment purposes; we use 4
* to keep the data well-aligned.
*/
tmp
=
(
FLAC__int32
*
)
safe_malloc_muladd2_
(
sizeof
(
FLAC__int32
),
/*times (*/
size
,
/*+*/
4
/*)*/
);
tmp
=
safe_malloc_muladd2_
(
sizeof
(
FLAC__int32
),
/*times (*/
size
,
/*+*/
4
/*)*/
);
if
(
tmp
==
0
)
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
...
...
@@ -1492,7 +1492,7 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder)
case
FLAC__METADATA_TYPE_APPLICATION
:
/* remember, we read the ID already */
if
(
real_length
>
0
)
{
if
(
0
==
(
block
.
data
.
application
.
data
=
(
FLAC__byte
*
)
malloc
(
real_length
)))
{
if
(
0
==
(
block
.
data
.
application
.
data
=
malloc
(
real_length
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1520,7 +1520,7 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder)
break
;
default:
if
(
real_length
>
0
)
{
if
(
0
==
(
block
.
data
.
unknown
.
data
=
(
FLAC__byte
*
)
malloc
(
real_length
)))
{
if
(
0
==
(
block
.
data
.
unknown
.
data
=
malloc
(
real_length
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1674,7 +1674,7 @@ FLAC__bool read_metadata_seektable_(FLAC__StreamDecoder *decoder, FLAC__bool is_
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
num_points
=
length
/
FLAC__STREAM_METADATA_SEEKPOINT_LENGTH
;
/* use realloc since we may pass through here several times (e.g. after seeking) */
if
(
0
==
(
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
points
=
(
FLAC__StreamMetadata_SeekPoint
*
)
safe_realloc_mul_2op_
(
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
points
,
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
))))
{
if
(
0
==
(
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
points
=
safe_realloc_mul_2op_
(
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
points
,
decoder
->
private_
->
seek_table
.
data
.
seek_table
.
num_points
,
/*times*/
sizeof
(
FLAC__StreamMetadata_SeekPoint
))))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1713,7 +1713,7 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
if
(
!
FLAC__bitreader_read_uint32_little_endian
(
decoder
->
private_
->
input
,
&
obj
->
vendor_string
.
length
))
return
false
;
/* read_callback_ sets the state for us */
if
(
obj
->
vendor_string
.
length
>
0
)
{
if
(
0
==
(
obj
->
vendor_string
.
entry
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
obj
->
vendor_string
.
length
,
/*+*/
1
)))
{
if
(
0
==
(
obj
->
vendor_string
.
entry
=
safe_malloc_add_2op_
(
obj
->
vendor_string
.
length
,
/*+*/
1
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1731,7 +1731,7 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
/* read comments */
if
(
obj
->
num_comments
>
0
)
{
if
(
0
==
(
obj
->
comments
=
(
FLAC__StreamMetadata_VorbisComment_Entry
*
)
safe_malloc_mul_2op_
(
obj
->
num_comments
,
/*times*/
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
))))
{
if
(
0
==
(
obj
->
comments
=
safe_malloc_mul_2op_
(
obj
->
num_comments
,
/*times*/
sizeof
(
FLAC__StreamMetadata_VorbisComment_Entry
))))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1740,7 +1740,7 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
if
(
!
FLAC__bitreader_read_uint32_little_endian
(
decoder
->
private_
->
input
,
&
obj
->
comments
[
i
].
length
))
return
false
;
/* read_callback_ sets the state for us */
if
(
obj
->
comments
[
i
].
length
>
0
)
{
if
(
0
==
(
obj
->
comments
[
i
].
entry
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
obj
->
comments
[
i
].
length
,
/*+*/
1
)))
{
if
(
0
==
(
obj
->
comments
[
i
].
entry
=
safe_malloc_add_2op_
(
obj
->
comments
[
i
].
length
,
/*+*/
1
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1786,7 +1786,7 @@ FLAC__bool read_metadata_cuesheet_(FLAC__StreamDecoder *decoder, FLAC__StreamMet
obj
->
num_tracks
=
x
;
if
(
obj
->
num_tracks
>
0
)
{
if
(
0
==
(
obj
->
tracks
=
(
FLAC__StreamMetadata_CueSheet_Track
*
)
safe_calloc_
(
obj
->
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
))))
{
if
(
0
==
(
obj
->
tracks
=
safe_calloc_
(
obj
->
num_tracks
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Track
))))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1819,7 +1819,7 @@ FLAC__bool read_metadata_cuesheet_(FLAC__StreamDecoder *decoder, FLAC__StreamMet
track
->
num_indices
=
(
FLAC__byte
)
x
;
if
(
track
->
num_indices
>
0
)
{
if
(
0
==
(
track
->
indices
=
(
FLAC__StreamMetadata_CueSheet_Index
*
)
safe_calloc_
(
track
->
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
{
if
(
0
==
(
track
->
indices
=
safe_calloc_
(
track
->
num_indices
,
sizeof
(
FLAC__StreamMetadata_CueSheet_Index
))))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1856,7 +1856,7 @@ FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMeta
/* read MIME type */
if
(
!
FLAC__bitreader_read_raw_uint32
(
decoder
->
private_
->
input
,
&
x
,
FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN
))
return
false
;
/* read_callback_ sets the state for us */
if
(
0
==
(
obj
->
mime_type
=
(
char
*
)
safe_malloc_add_2op_
(
x
,
/*+*/
1
)))
{
if
(
0
==
(
obj
->
mime_type
=
safe_malloc_add_2op_
(
x
,
/*+*/
1
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1869,7 +1869,7 @@ FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMeta
/* read description */
if
(
!
FLAC__bitreader_read_raw_uint32
(
decoder
->
private_
->
input
,
&
x
,
FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN
))
return
false
;
/* read_callback_ sets the state for us */
if
(
0
==
(
obj
->
description
=
(
FLAC__byte
*
)
safe_malloc_add_2op_
(
x
,
/*+*/
1
)))
{
if
(
0
==
(
obj
->
description
=
safe_malloc_add_2op_
(
x
,
/*+*/
1
)))
{
decoder
->
protected_
->
state
=
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
;
return
false
;
}
...
...
@@ -1898,7 +1898,7 @@ FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMeta
/* read data */
if
(
!
FLAC__bitreader_read_raw_uint32
(
decoder
->
private_
->
input
,
&
(
obj
->
data_length
),
FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
))