comparison src/textprop.c @ 106780:85fd976607be

Fix bounds checking for text properties in `format' (Bug#5306). * intervals.h, textprop.c (extend_property_ranges): Return value and args changed. Discard properties that begin at or after the new end (Bug#5306). * editfns.c (Fformat): Caller changed.

106779:57e095b90f5b

  return modified_p;
}



/* Modify end-points of ranges in LIST destructively.  LIST is a list
   as returned from text_property_list.  Change end-points equal to
   OLD_END to NEW_END.  */

void
extend_property_ranges (list, old_end, new_end)
     Lisp_Object list, old_end, new_end;
{
  for (; CONSP (list); list = XCDR (list))
    {
      Lisp_Object item, end;

      item = XCAR (list);
      end = XCAR (XCDR (item));

      if (EQ (end, old_end))
	XSETCAR (XCDR (item), new_end);
    }
}



/* Call the modification hook functions in LIST, each with START and END.  */

106780:85fd976607be

  return modified_p;
}



/* Modify end-points of ranges in LIST destructively, and return the
   new list.  LIST is a list as returned from text_property_list.
   Discard properties that begin at or after NEW_END, and limit
   end-points to NEW_END.  */

Lisp_Object
extend_property_ranges (list, new_end)
     Lisp_Object list, new_end;
{
  Lisp_Object prev = Qnil, head = list;
  int max = XINT (new_end);

  for (; CONSP (list); prev = list, list = XCDR (list))
    {
      Lisp_Object item, beg, end;

      item = XCAR (list);
      beg = XCAR (item);
      end = XCAR (XCDR (item));

      if (XINT (beg) >= max)
	{
	  /* The start-point is past the end of the new string.
	     Discard this property.  */
	  if (EQ (head, list))
	    head = XCDR (list);
	  else
	    XSETCDR (prev, XCDR (list));
	}
      else if (XINT (end) > max)
	/* The end-point is past the end of the new string.  */
	XSETCAR (XCDR (item), new_end);
    }

  return head;
}



/* Call the modification hook functions in LIST, each with START and END.  */