diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 3b076704c..77992ab6f 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -1064,7 +1064,7 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0                       \
+            NULL, 0, 0                    \
           },
 
 #define CFF_FIELD_DELTA( code, name, max, id ) \
@@ -1073,7 +1073,7 @@
             code | CFFCODE,                    \
             FT_FIELD_OFFSET( name ),           \
             FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
+            NULL,                              \
             max,                               \
             FT_FIELD_OFFSET( num_ ## name )    \
           },
@@ -1083,7 +1083,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0 }
   };
 
 
@@ -1117,7 +1117,7 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0,                      \
+            NULL, 0, 0,                   \
             id                            \
           },
 
@@ -1127,7 +1127,7 @@
             code | CFFCODE,                    \
             FT_FIELD_OFFSET( name ),           \
             FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
+            NULL,                              \
             max,                               \
             FT_FIELD_OFFSET( num_ ## name ),   \
             id                                 \
@@ -1138,7 +1138,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0, NULL }
   };