1 files changed, 4 insertions, 1 deletions

diff --git a/src/charset.c b/src/charset.c
index e88d1839b20..8518cc8829d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -811,7 +811,10 @@ strwidth (str, len)
           int c = STRING_CHAR (str, endp - str);
 
           /* Get the way the display table would display it.  */
-          disp = DISP_CHAR_VECTOR (dp, c);
+          if (dp)
+            disp = DISP_CHAR_VECTOR (dp, c);
+          else
+            disp = Qnil;
 
           if (VECTORP (disp))
             thiswidth = XVECTOR (disp)->size;