Changeset 20775 in webkit


Ignore:
Timestamp:
Apr 6, 2007 8:02:11 PM (17 years ago)
Author:
kjk
Message:

Index: JavaScriptCore/ChangeLog
===================================================================
--- JavaScriptCore/ChangeLog (revision 20709)
+++ JavaScriptCore/ChangeLog (working copy)
@@ -1,3 +1,14 @@
+2007-04-04 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+
+ Reviewed by darin.
+
+ Coverity fix. Coverity says:
+ "Event var_deref_model: Variable "sourceRanges" tracked as NULL was passed to a
+ function that dereferences it"
+
+ * kjs/string_object.cpp:
+ (KJS::replace):
+

2007-04-03 Kevin McCullough <kmccullough@apple.com>


Reviewed by Adam.

Index: JavaScriptCore/kjs/string_object.cpp
===================================================================
--- JavaScriptCore/kjs/string_object.cpp (revision 20709)
+++ JavaScriptCore/kjs/string_object.cpp (working copy)
@@ -387,7 +387,9 @@ static JSValue *replace(ExecState *exec,

if (lastIndex < source.size())

pushSourceRange(sourceRanges, sourceRangeCount, sourceRangeCapacity, UString::Range(lastIndex, source.size() - lastIndex));


  • UString result = source.spliceSubstringsWithSeparators(sourceRanges, sourceRangeCount, replacements, replacementCount);

+ UString result;
+ if (sourceRanges)
+ result = source.spliceSubstringsWithSeparators(sourceRanges, sourceRangeCount, replacements, replacementCount);

delete [] sourceRanges;
delete [] replacements;

Location:
trunk/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r20759 r20775  
     12007-04-06  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
     2
     3        Reviewed by darin.
     4
     5        Coverity fix. Coverity says:
     6        "Event var_deref_model: Variable "sourceRanges" tracked as NULL was passed to a
     7        function that dereferences it"
     8
     9        * kjs/string_object.cpp:
     10        (KJS::replace):
     11
    1122007-04-06  Geoffrey Garen  <ggaren@apple.com>
    213
  • trunk/JavaScriptCore/kjs/string_object.cpp

    r20310 r20775  
    388388      pushSourceRange(sourceRanges, sourceRangeCount, sourceRangeCapacity, UString::Range(lastIndex, source.size() - lastIndex));
    389389
    390     UString result = source.spliceSubstringsWithSeparators(sourceRanges, sourceRangeCount, replacements, replacementCount);
     390    UString result;
     391    if (sourceRanges)
     392        result = source.spliceSubstringsWithSeparators(sourceRanges, sourceRangeCount, replacements, replacementCount);
    391393
    392394    delete [] sourceRanges;
Note: See TracChangeset for help on using the changeset viewer.