michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add null checks

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-22 10:58:31 -05:00
parent 94451de6d2
commit f8c88aa632
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -95,6 +95,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
int defaultImageExtractionTimeoutMs, int defaultImageExtractionTimeoutMs,
bool enableEncoderFontFile, IEnvironmentInfo environmentInfo) bool enableEncoderFontFile, IEnvironmentInfo environmentInfo)
{ {
if (jsonSerializer == null)
{
throw new ArgumentNullException("jsonSerializer");
}
_logger = logger; _logger = logger;
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
ConfigurationManager = configurationManager; ConfigurationManager = configurationManager;
@ -632,7 +637,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
var result = _jsonSerializer.DeserializeFromStream<InternalMediaInfoResult>(process.StandardOutput.BaseStream); var result = _jsonSerializer.DeserializeFromStream<InternalMediaInfoResult>(process.StandardOutput.BaseStream);
if (result.streams == null && result.format == null) if (result == null || (result.streams == null && result.format == null))
{ {
throw new Exception("ffprobe failed - streams and format are both null."); throw new Exception("ffprobe failed - streams and format are both null.");
} }