22a050f Fixed regression from previous commit

Authored and Committed by jkucera 5 years ago
    Fixed regression from previous commit
    
    Additional changes:
    - commented changes related to discovered static analysis issues
    - found and fixed possible NULL dereference that was previously
      not included in static analysis report (false negative?)
    
        
file modified
+13 -7
file modified
+24 -11