webengine/osswebengine/WebCore/platform/KURL.cpp
branchRCL_3
changeset 44 800203832575
parent 0 dd21522fd290
child 47 e1bea15f9a39
--- a/webengine/osswebengine/WebCore/platform/KURL.cpp	Wed Jun 09 10:52:50 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/KURL.cpp	Mon Jun 21 16:54:17 2010 +0300
@@ -234,7 +234,11 @@
     if (url && url[0] == '/') {
          // 5 for "file:", 1 for terminator
         size_t urlLength = strlen(url) + 1;
+#if PLATFORM(SYMBIAN)
+        Vector<char, 256> buffer(urlLength + 5);
+#else        
         Vector<char, 2048> buffer(urlLength + 5);
+#endif        
         buffer[0] = 'f';
         buffer[1] = 'i';
         buffer[2] = 'l';
@@ -250,7 +254,11 @@
 {
     if (!url.isEmpty() && url[0] == '/') {
         // 5 for "file:", 1 for terminator
+#if PLATFORM(SYMBIAN)
+        Vector<char, 256> buffer(url.length() + 6);
+#else
         Vector<char, 2048> buffer(url.length() + 6);
+#endif        
         buffer[0] = 'f';
         buffer[1] = 'i';
         buffer[2] = 'l';
@@ -403,7 +411,11 @@
                 // must be relative-path reference
 
                 // Base part plus relative part plus one possible slash added in between plus terminating \0 byte.
+#if PLATFORM(SYMBIAN)
+                Vector<char, 256> buffer(base.pathEndPos + 1 + strlen(str) + 1);
+#else
                 Vector<char, 2048> buffer(base.pathEndPos + 1 + strlen(str) + 1);
+#endif                
 
                 char *bufferPos = buffer.data();
                 
@@ -764,7 +776,11 @@
 {
     DeprecatedString result("");
 
+#if PLATFORM(SYMBIAN)
+    Vector<char, 256> buffer(0);
+#else
     Vector<char, 2048> buffer(0);
+#endif    
 
     int length = urlString.length();
     int decodedPosition = 0;
@@ -1104,7 +1120,11 @@
 
     // assemble it all, remembering the real ranges
 
+#if PLATFORM(SYMBIAN)
+    Vector<char, 256> buffer(fragmentEnd * 3 + 1);
+#else    
     Vector<char, 4096> buffer(fragmentEnd * 3 + 1);
+#endif    
 
     char *p = buffer.data();
     const char *strPtr = url;
@@ -1223,7 +1243,11 @@
     // add path, escaping bad characters
     
     if (hierarchical && hasSlashDotOrDotDot(url)) {
+#if PLATFORM(SYMBIAN)
+        Vector<char, 256> path_buffer(pathEnd - pathStart + 1);
+#else        
         Vector<char, 4096> path_buffer(pathEnd - pathStart + 1);
+#endif        
         copyPathRemovingDots(path_buffer.data(), url, pathStart, pathEnd);
         appendEscapingBadChars(p, path_buffer.data(), strlen(path_buffer.data()));
     } else
@@ -1268,7 +1292,11 @@
 {
     DeprecatedCString asUTF8 = notEncodedString.utf8();
     
+#if PLATFORM(SYMBIAN)
+    Vector<char, 256> buffer(asUTF8.length() * 3 + 1);
+#else    
     Vector<char, 4096> buffer(asUTF8.length() * 3 + 1);
+#endif    
     char *p = buffer.data();
 
     const char *str = asUTF8;