Rewrote the OSRF_MALLOC macro so that it evaluates each