FileProperties: fix crash if try to get NULL data as string

Clement Champetier · Clement Champetier · commit 7c2e6fc59dc7 · 2015-03-04T11:40:40.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -20,21 +20,21 @@ FileProperties::FileProperties( const FormatContext& formatContext )
 
 std::string FileProperties::getFilename() const
 {
-	if( ! _formatContext )
+	if( ! _formatContext || ! _formatContext->filename )
 		throw std::runtime_error( "unknown format context" );
 	return _formatContext->filename;
 }
 
 std::string FileProperties::getFormatName() const
 {
-	if( ! _formatContext || ! _formatContext->iformat )
+	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->name )
 		throw std::runtime_error( "unknown format context" );
 	return _formatContext->iformat->name;
 }
 
 std::string FileProperties::getFormatLongName() const
 {
-	if( ! _formatContext || ! _formatContext->iformat )
+	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->long_name )
 		throw std::runtime_error( "unknown format context" );
 	return _formatContext->iformat->long_name;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,21 +20,21 @@ FileProperties::FileProperties( const FormatContext& formatContext )`
`20`	`20`
`21`	`21`	`std::string FileProperties::getFilename() const`
`22`	`22`	`{`
`23`		`- if( ! _formatContext )`
	`23`	`+ if( ! _formatContext \|\| ! _formatContext->filename )`
`24`	`24`	`throw std::runtime_error( "unknown format context" );`
`25`	`25`	`return _formatContext->filename;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`std::string FileProperties::getFormatName() const`
`29`	`29`	`{`
`30`		`- if( ! _formatContext \|\| ! _formatContext->iformat )`
	`30`	`+ if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->name )`
`31`	`31`	`throw std::runtime_error( "unknown format context" );`
`32`	`32`	`return _formatContext->iformat->name;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`std::string FileProperties::getFormatLongName() const`
`36`	`36`	`{`
`37`		`- if( ! _formatContext \|\| ! _formatContext->iformat )`
	`37`	`+ if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->long_name )`
`38`	`38`	`throw std::runtime_error( "unknown format context" );`
`39`	`39`	`return _formatContext->iformat->long_name;`
`40`	`40`	`}`