Index: libyaml/trunk/src/scanner.c
===================================================================
--- libyaml/trunk/src/scanner.c	(revision 211)
+++ libyaml/trunk/src/scanner.c	(revision 213)
@@ -939,9 +939,11 @@
     assert(token);  /* Non-NULL token object is expected. */
 
+    /* Erase the token object. */
+
+    memset(token, 0, sizeof(yaml_token_t));
+
     /* No tokens after STREAM-END or error. */
 
     if (parser->stream_end_produced || parser->error) {
-        memset(token, 0, sizeof(yaml_token_t));
-
         return 1;
     }