Reinstante DEFINE_NULL_DATA

Seems like I messed up; buffer overrun got reported.
3 files changed