comparison src/coding.c @ 53007:36796e056954

(coding_allocate_composition_data): Reset coding->composing to COMPOSITION_NO. (coding_restore_composition): Detect invalid composition data. Give Fstring and Fvector a Lispy integer, not C int.

53006:36e0303c65f1

  cmp_data->next = NULL;
  if (coding->cmp_data)
    coding->cmp_data->next = cmp_data;
  coding->cmp_data = cmp_data;
  coding->cmp_data_start = 0;
}

/* Handle composition start sequence ESC 0, ESC 2, ESC 3, or ESC 4.
   ESC 0 : relative composition : ESC 0 CHAR ... ESC 1
   ESC 2 : rulebase composition : ESC 2 CHAR RULE CHAR RULE ... CHAR ESC 1

	{
	  int *data = cmp_data->data + i;
	  enum composition_method method = (enum composition_method) data[3];
	  Lisp_Object components;

	  if (method == COMPOSITION_RELATIVE)
	    components = Qnil;
	  else
	    {
	      int len = data[0] - 4, j;

		  && len % 2 == 0)
		len --;
	      for (j = 0; j < len; j++)
		args[j] = make_number (data[4 + j]);
	      components = (method == COMPOSITION_WITH_ALTCHARS
			    ? Fstring (len, args) : Fvector (len, args));
	    }
	  compose_text (data[1], data[2], components, Qnil, obj);
	}
      cmp_data = cmp_data->next;
    }

53007:36796e056954

  cmp_data->next = NULL;
  if (coding->cmp_data)
    coding->cmp_data->next = cmp_data;
  coding->cmp_data = cmp_data;
  coding->cmp_data_start = 0;
  coding->composing = COMPOSITION_NO;
}

/* Handle composition start sequence ESC 0, ESC 2, ESC 3, or ESC 4.
   ESC 0 : relative composition : ESC 0 CHAR ... ESC 1
   ESC 2 : rulebase composition : ESC 2 CHAR RULE CHAR RULE ... CHAR ESC 1

	{
	  int *data = cmp_data->data + i;
	  enum composition_method method = (enum composition_method) data[3];
	  Lisp_Object components;

	  if (data[0] < 0 || i + data[0] > cmp_data->used)
	    /* Invalid composition data.  */
	    break;

	  if (method == COMPOSITION_RELATIVE)
	    components = Qnil;
	  else
	    {
	      int len = data[0] - 4, j;

		  && len % 2 == 0)
		len --;
	      for (j = 0; j < len; j++)
		args[j] = make_number (data[4 + j]);
	      components = (method == COMPOSITION_WITH_ALTCHARS
			    ? Fstring (make_number (len), args)
			    : Fvector (make_number (len), args));
	    }
	  compose_text (data[1], data[2], components, Qnil, obj);
	}
      cmp_data = cmp_data->next;
    }