*** field.c	2003-04-19 09:14:33.000000000 +0900
--- field-patched.c	2008-01-13 16:08:22.000000000 +0900
***************
*** 291,297 ****

        end = *ptr + length;

!       while (end - *ptr > 0) {
  	ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
  	if (ucs4 == 0)
  	  goto fail;
--- 291,297 ----

        end = *ptr + length;

!       while (end - *ptr > 0 && **ptr != '\0') {
  	ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
  	if (ucs4 == 0)
  	  goto fail;