[Emacs-diffs] Changes to emacs/src/coding.c

[Kenichi Handa]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.293 emacs/src/coding.c:1.294
*** emacs/src/coding.c:1.293    Tue Oct  7 19:34:15 2003
--- emacs/src/coding.c  Fri Nov  7 00:55:27 2003
***************
*** 1689,1694 ****
--- 1689,1695 ----
      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.
***************
*** 5440,5445 ****
--- 5441,5450 ----
          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
***************
*** 5453,5459 ****
              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);
        }
--- 5458,5465 ----
              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);
        }