Fix bug introduced in 5998cbec8d causing a function to always return NULL
Merge branch 'master' of github.com:cquaid/radare2