Skip to content

Fix Coverity Scan warnings #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 20, 2014
Merged

Fix Coverity Scan warnings #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50843b9
Common: fix variable used after null check
Aug 20, 2014
c838aea
Common: fix out-of-bounds access in setters functions of ParamSet
Aug 20, 2014
a0aed62
VideoStreamProperties: fix uninitialized variable topFieldFirst
Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ VideoProperties videoStreamInfo(
vp.maxBitRate = codec_context->rc_max_rate;
vp.minBitRate = codec_context->rc_min_rate;
vp.isInterlaced = false;
vp.topFieldFirst = false;

vp.ticksPerFrame = codec_context->ticks_per_frame,
vp.width = codec_context->width,
Expand Down
36 changes: 14 additions & 22 deletions src/AvTranscoder/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool

if( ! flagOpt )
{
std::cout << flag << std::endl << " : " << flagOpt->default_val.i64 << std::endl;
throw std::runtime_error( "unknown flag " + flag );
}

error = av_opt_get_int( _objContext, key.c_str(), AV_OPT_SEARCH_CHILDREN, &optVal );
if( error != 0 )
{
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "unknown key " + key + ": " + err );
}

Expand All @@ -48,9 +46,8 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool
error = av_opt_set_int( _objContext, key.c_str(), optVal, AV_OPT_SEARCH_CHILDREN );
if( error != 0 )
{
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + flag + ": " + err );
}
}
Expand All @@ -60,9 +57,8 @@ void ParamSet::set( const std::string& key, const bool value )
int error = av_opt_set_int( _objContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
if( error != 0 )
{
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + ( value ? "true" : "false" ) + ": " + err );
}
}
Expand All @@ -76,9 +72,8 @@ void ParamSet::set( const std::string& key, const int value )
{
std::ostringstream os;
os << value;
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -93,9 +88,8 @@ void ParamSet::set( const std::string& key, const int num, const int den )
{
std::ostringstream os;
os << num << "/" << den;
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -107,9 +101,8 @@ void ParamSet::set( const std::string& key, const double value )
{
std::ostringstream os;
os << value;
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -119,9 +112,8 @@ void ParamSet::set( const std::string& key, const std::string& value )
int error = av_opt_set( _objContext, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN );
if( error != 0 )
{
std::string err( "", AV_ERROR_MAX_STRING_SIZE );
//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
throw std::runtime_error( "setting " + key + " parameter to " + value + ": " + err );
}
}
Expand Down