Commit 5225949d authored by eric@webkit.org's avatar eric@webkit.org

2010-02-08 Kwang Yul Seo <skyul@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: svn://svn.chromium.org/blink/trunk@54495 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent aa6f1336
2010-02-08 Kwang Yul Seo <skyul@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@nokia.com>
Reviewed by Simon Hausmann.
......
......@@ -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()
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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) {
......
......@@ -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();
......
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment