comparison src/coding.c @ 107321:9b814b3ee348

Fix bug in decoding emacs-mule encoding. coding.c (decode_coding_emacs_mule): Fixup pointers to buffer text that could be relocated inside the call to emacs_mule_char. (emacs_mule_char): Use CODING_DECODE_CHAR instead of DECODE_CHAR. (CODING_DECODE_CHAR): Add a comment describing its purpose.

107320:d2bfe26756ed

    default:
      Vlast_code_conversion_error = intern ("Unknown error");
    }
}

#define CODING_DECODE_CHAR(coding, src, src_base, src_end, charset, code, c) \
  do {									     \
    charset_map_loaded = 0;						     \
    c = DECODE_CHAR (charset, code);					     \
    if (charset_map_loaded)						     \

	  break;

	default:
	  abort ();
	}
      c = DECODE_CHAR (charset, code);
      if (c < 0)
	goto invalid_code;
    }
  *nbytes = src - src_base;
  *nchars = consumed_chars;

	    }
	}
      else
	{
	  int nchars, nbytes;

	  c = emacs_mule_char (coding, src_base, &nbytes, &nchars, &id,
			       cmp_status);
	  if (c < 0)
	    {
	      if (c == -1)
		goto invalid_code;
	      if (c == -2)

107321:9b814b3ee348

    default:
      Vlast_code_conversion_error = intern ("Unknown error");
    }
}

/* This wrapper macro is used to preserve validity of pointers into
   buffer text across calls to decode_char, which could cause
   relocation of buffers if it loads a charset map, because loading a
   charset map allocates large structures.  */
#define CODING_DECODE_CHAR(coding, src, src_base, src_end, charset, code, c) \
  do {									     \
    charset_map_loaded = 0;						     \
    c = DECODE_CHAR (charset, code);					     \
    if (charset_map_loaded)						     \

	  break;

	default:
	  abort ();
	}
      CODING_DECODE_CHAR (coding, src, src_base, src_end, charset, code, c);
      if (c < 0)
	goto invalid_code;
    }
  *nbytes = src - src_base;
  *nchars = consumed_chars;

	    }
	}
      else
	{
	  int nchars, nbytes;
	  /* emacs_mule_char can load a charset map from a file, which
	     allocates a large structure and might cause buffer text
	     to be relocated as result.  Thus, we need to remember the
	     original pointer to buffer text, and fixup all related
	     pointers after the call.  */
	  const unsigned char *orig = coding->source;
	  EMACS_INT offset;

	  c = emacs_mule_char (coding, src_base, &nbytes, &nchars, &id,
			       cmp_status);
	  offset = coding->source - orig;
	  if (offset)
	    {
	      src += offset;
	      src_base += offset;
	      src_end += offset;
	    }
	  if (c < 0)
	    {
	      if (c == -1)
		goto invalid_code;
	      if (c == -2)