Changeset 20775 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Apr 6, 2007, 8:02:11 PM (18 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 <​[email protected]>
+
+ 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 <​[email protected]>

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;

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -388 +388 @@
       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;