[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
eric at webkit.org
eric at webkit.org
Wed Feb 10 22:19:58 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 393aac485d02909d8f2ba8dcf17dc968ba951d42
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 8 18:21:59 2010 +0000
2010-02-08 Kwang Yul Seo <skyul at company100.net>
Reviewed by Darin Adler.
Use fastStrDup instead of strdup
https://bugs.webkit.org/show_bug.cgi?id=33943
Replace strdup/free with fastStrDup/fastFree.
* bridge/IdentifierRep.h:
(WebCore::IdentifierRep::IdentifierRep):
* bridge/jni/JNIBridge.cpp:
(JavaMethod::~JavaMethod):
(appendClassName):
(JavaMethod::signature):
* bridge/jni/jsc/JavaClassJSC.cpp:
(JavaClass::JavaClass):
(JavaClass::~JavaClass):
* platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::~ResourceHandleManager):
(WebCore::ResourceHandleManager::setCookieJarFileName):
(WebCore::ResourceHandleManager::initializeHandle):
* plugins/PluginStream.cpp:
(WebCore::PluginStream::~PluginStream):
(WebCore::PluginStream::startStream):
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::xsltParamArrayFromParameterMap):
(WebCore::freeXsltParamArray):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 13884b1..e8b5e7a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-02-08 Kwang Yul Seo <skyul at company100.net>
+
+ Reviewed by Darin Adler.
+
+ Use fastStrDup instead of strdup
+ https://bugs.webkit.org/show_bug.cgi?id=33943
+
+ Replace strdup/free with fastStrDup/fastFree.
+
+ * bridge/IdentifierRep.h:
+ (WebCore::IdentifierRep::IdentifierRep):
+ * bridge/jni/JNIBridge.cpp:
+ (JavaMethod::~JavaMethod):
+ (appendClassName):
+ (JavaMethod::signature):
+ * bridge/jni/jsc/JavaClassJSC.cpp:
+ (JavaClass::JavaClass):
+ (JavaClass::~JavaClass):
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::ResourceHandleManager::~ResourceHandleManager):
+ (WebCore::ResourceHandleManager::setCookieJarFileName):
+ (WebCore::ResourceHandleManager::initializeHandle):
+ * plugins/PluginStream.cpp:
+ (WebCore::PluginStream::~PluginStream):
+ (WebCore::PluginStream::startStream):
+ * xml/XSLTProcessorLibxslt.cpp:
+ (WebCore::xsltParamArrayFromParameterMap):
+ (WebCore::freeXsltParamArray):
+
2010-02-08 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebCore/bridge/IdentifierRep.h b/WebCore/bridge/IdentifierRep.h
index 61b0b57..99bae0b 100644
--- a/WebCore/bridge/IdentifierRep.h
+++ b/WebCore/bridge/IdentifierRep.h
@@ -55,7 +55,7 @@ private:
IdentifierRep(const char* name)
: m_isString(true)
{
- m_value.m_string = strdup(name);
+ m_value.m_string = fastStrDup(name);
}
~IdentifierRep()
diff --git a/WebCore/bridge/jni/JNIBridge.cpp b/WebCore/bridge/jni/JNIBridge.cpp
index 3329ba8..f8a3979 100644
--- a/WebCore/bridge/jni/JNIBridge.cpp
+++ b/WebCore/bridge/jni/JNIBridge.cpp
@@ -107,7 +107,7 @@ JavaMethod::JavaMethod(JNIEnv* env, jobject aMethod)
JavaMethod::~JavaMethod()
{
if (m_signature)
- free(m_signature);
+ fastFree(m_signature);
delete[] m_parameters;
};
@@ -119,7 +119,7 @@ static void appendClassName(StringBuilder& builder, const char* className)
ASSERT(JSLock::lockCount() > 0);
#endif
- char* c = strdup(className);
+ char* c = fastStrDup(className);
char* result = c;
while (*c) {
@@ -130,7 +130,7 @@ static void appendClassName(StringBuilder& builder, const char* className)
builder.append(result);
- free(result);
+ fastFree(result);
}
const char* JavaMethod::signature() const
@@ -169,7 +169,7 @@ const char* JavaMethod::signature() const
}
String signatureString = signatureBuilder.toString();
- m_signature = strdup(signatureString.utf8().data());
+ m_signature = fastStrDup(signatureString.utf8().data());
}
return m_signature;
diff --git a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
index bbe3871..ec5c172 100644
--- a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
@@ -41,16 +41,16 @@ JavaClass::JavaClass(jobject anInstance)
if (!aClass) {
fprintf(stderr, "%s: unable to call getClass on instance %p\n", __PRETTY_FUNCTION__, anInstance);
- m_name = strdup("<Unknown>");
+ m_name = fastStrDup("<Unknown>");
return;
}
if (jstring className = (jstring)callJNIMethod<jobject>(aClass, "getName", "()Ljava/lang/String;")) {
const char* classNameC = getCharactersFromJString(className);
- m_name = strdup(classNameC);
+ m_name = fastStrDup(classNameC);
releaseCharactersForJString(className, classNameC);
} else
- m_name = strdup("<Unknown>");
+ m_name = fastStrDup("<Unknown>");
int i;
JNIEnv* env = getJNIEnv();
@@ -97,7 +97,7 @@ JavaClass::JavaClass(jobject anInstance)
JavaClass::~JavaClass()
{
- free(const_cast<char*>(m_name));
+ fastFree(const_cast<char*>(m_name));
JSLock lock(SilenceAssertionsOnly);
diff --git a/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
index 81ac1a3..4212562 100644
--- a/WebCore/platform/network/curl/ResourceHandleCurl.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
@@ -91,7 +91,7 @@ static HashSet<String>& allowsAnyHTTPSCertificateHosts()
ResourceHandleInternal::~ResourceHandleInternal()
{
- free(m_url);
+ fastFree(m_url);
if (m_customHeaders)
curl_slist_free_all(m_customHeaders);
}
diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index bcae67f..962754c 100644
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -135,13 +135,13 @@ ResourceHandleManager::~ResourceHandleManager()
curl_multi_cleanup(m_curlMultiHandle);
curl_share_cleanup(m_curlShareHandle);
if (m_cookieJarFileName)
- free(m_cookieJarFileName);
+ fastFree(m_cookieJarFileName);
curl_global_cleanup();
}
void ResourceHandleManager::setCookieJarFileName(const char* cookieJarFileName)
{
- m_cookieJarFileName = strdup(cookieJarFileName);
+ m_cookieJarFileName = fastStrDup(cookieJarFileName);
}
ResourceHandleManager* ResourceHandleManager::sharedInstance()
@@ -741,7 +741,7 @@ void ResourceHandleManager::initializeHandle(ResourceHandle* job)
ASSERT(!d->m_url);
// url is in ASCII so latin1() will only convert it to char* without character translation.
- d->m_url = strdup(url.latin1().data());
+ d->m_url = fastStrDup(url.latin1().data());
curl_easy_setopt(d->m_handle, CURLOPT_URL, d->m_url);
if (m_cookieJarFileName) {
diff --git a/WebCore/plugins/PluginStream.cpp b/WebCore/plugins/PluginStream.cpp
index 4be3d13..bf35ba4 100644
--- a/WebCore/plugins/PluginStream.cpp
+++ b/WebCore/plugins/PluginStream.cpp
@@ -84,7 +84,7 @@ PluginStream::~PluginStream()
ASSERT(m_streamState != StreamStarted);
ASSERT(!m_loader);
- free((char*)m_stream.url);
+ fastFree((char*)m_stream.url);
streams().remove(&m_stream);
}
@@ -133,9 +133,9 @@ void PluginStream::startStream()
// Some plugins (Flash) expect that javascript URLs are passed back decoded as this is the
// format used when requesting the URL.
if (protocolIsJavaScript(responseURL))
- m_stream.url = strdup(decodeURLEscapeSequences(responseURL.string()).utf8().data());
+ m_stream.url = fastStrDup(decodeURLEscapeSequences(responseURL.string()).utf8().data());
else
- m_stream.url = strdup(responseURL.string().utf8().data());
+ m_stream.url = fastStrDup(responseURL.string().utf8().data());
CString mimeTypeStr = m_resourceResponse.mimeType().utf8();
diff --git a/WebCore/xml/XSLTProcessorLibxslt.cpp b/WebCore/xml/XSLTProcessorLibxslt.cpp
index ded5c68..e2da3ed 100644
--- a/WebCore/xml/XSLTProcessorLibxslt.cpp
+++ b/WebCore/xml/XSLTProcessorLibxslt.cpp
@@ -201,8 +201,8 @@ static const char** xsltParamArrayFromParameterMap(XSLTProcessor::ParameterMap&
XSLTProcessor::ParameterMap::iterator end = parameters.end();
unsigned index = 0;
for (XSLTProcessor::ParameterMap::iterator it = parameters.begin(); it != end; ++it) {
- parameterArray[index++] = strdup(it->first.utf8().data());
- parameterArray[index++] = strdup(it->second.utf8().data());
+ parameterArray[index++] = fastStrDup(it->first.utf8().data());
+ parameterArray[index++] = fastStrDup(it->second.utf8().data());
}
parameterArray[index] = 0;
@@ -216,8 +216,8 @@ static void freeXsltParamArray(const char** params)
return;
while (*temp) {
- free((void*)*(temp++)); // strdup returns malloc'd blocks, so we have to use free() here
- free((void*)*(temp++));
+ fastFree((void*)*(temp++));
+ fastFree((void*)*(temp++));
}
fastFree(params);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list