[xbmc][dvdnav] various safeguards

xbmc · Feb 14, 2016 · b6e55ae · b6e55ae
1 parent 27fd0e1
commit b6e55ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/dvdnav.c b/src/dvdnav.c
@@ -1265,6 +1265,11 @@ user_ops_t dvdnav_get_restrictions(dvdnav_t* this) {
 
   ops.ops_int = 0;
 
+  if (!this) {
+    printerr("Passed a NULL pointer.");
+    return ops.ops_struct;
+  }
+
   if(!this->started) {
     printerr("Virtual DVD machine not started.");
     return ops.ops_struct;

diff --git a/src/read_cache.c b/src/read_cache.c
@@ -335,7 +335,7 @@ dvdnav_status_t dvdnav_free_cache_block(dvdnav_t *self, unsigned char *buf) {
   pthread_mutex_lock(&cache->lock);
   for (i = 0; i < READ_CACHE_CHUNKS; i++) {
     if (cache->chunk[i].cache_buffer && buf >= cache->chunk[i].cache_buffer &&
-        buf < cache->chunk[i].cache_buffer + cache->chunk[i].cache_malloc_size * DVD_VIDEO_LB_LEN) {
+        buf < cache->chunk[i].cache_buffer + cache->chunk[i].cache_malloc_size * DVD_VIDEO_LB_LEN && cache->chunk[i].usage_count > 0) {
       cache->chunk[i].usage_count--;
     }
   }