[webkit-changes] cvs commit: WebCore/kwq KWQTextField.mm

[Darin]

darin       05/09/05 13:25:18

  Modified:    .        ChangeLog
               kwq      KWQTextField.mm
  Log:
          Reviewed by John Sullivan.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4025
            Reproducible crash (infinite recursion?) choosing Make Link from text field's contextual menu
  
          * kwq/KWQTextField.mm:
          (-[KWQTextFieldController textView:shouldChangeTextInRange:replacementString:]):
          Allow a replacement string of nil.
  
  Revision  Changes    Path
  1.93      +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- ChangeLog	5 Sep 2005 17:18:57 -0000	1.92
  +++ ChangeLog	5 Sep 2005 20:25:17 -0000	1.93
  @@ -1,3 +1,14 @@
  +2005-09-05  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by John Sullivan.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4025
  +          Reproducible crash (infinite recursion?) choosing Make Link from text field's contextual menu
  +
  +        * kwq/KWQTextField.mm:
  +        (-[KWQTextFieldController textView:shouldChangeTextInRange:replacementString:]):
  +        Allow a replacement string of nil.
  +
   2005-09-05  Alexey Proskuryakov  <ap at nypop.com>
   
           Reviewed and landed by Darin.
  
  
  
  1.87      +2 -0      WebCore/kwq/KWQTextField.mm
  
  Index: KWQTextField.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQTextField.mm,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- KWQTextField.mm	5 Sep 2005 03:43:03 -0000	1.86
  +++ KWQTextField.mm	5 Sep 2005 20:25:17 -0000	1.87
  @@ -449,6 +449,8 @@
   
   - (BOOL)textView:(NSTextView *)textView shouldChangeTextInRange:(NSRange)range replacementString:(NSString *)string
   {
  +    if (string == nil)
  +        return YES;
       NSRange newline = [string rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"\r\n"]];
       if (newline.location == NSNotFound) {
           return YES;