[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit f9194859b751e1a8c8f3c23d0480b8f2ba16153d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 03:10:32 2011 +0000

    2011-01-17  Jarred Nicholls  <jarred at sencha.com>
    
            Reviewed by Csaba Osztrogonác.
    
            REGRESSION(r75709): Return value of fscanf() shouldn't be ignored.
            https://bugs.webkit.org/show_bug.cgi?id=52585
    
            gcc 4.4.4+ has warn_unused_value attribute on fscanf, so we should check
            the return value to get around the gcc warning
    
            * jit/ExecutableAllocatorFixedVMPool.cpp:
            (JSC::maybeModifyVMPoolSize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index fdc1b89..9d92e9d 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-17  Jarred Nicholls  <jarred at sencha.com>
+
+        Reviewed by Csaba Osztrogonác.
+
+        REGRESSION(r75709): Return value of fscanf() shouldn't be ignored.
+        https://bugs.webkit.org/show_bug.cgi?id=52585
+        
+        gcc 4.4.4+ has warn_unused_value attribute on fscanf, so we should check
+        the return value to get around the gcc warning
+
+        * jit/ExecutableAllocatorFixedVMPool.cpp:
+        (JSC::maybeModifyVMPoolSize):
+
 2011-01-17  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
index dd711d4..9fc889e 100644
--- a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+++ b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
@@ -461,10 +461,11 @@ static void maybeModifyVMPoolSize()
         return;
 
     unsigned overcommit = 0;
-    fscanf(fp, "%u", &overcommit);
-    if (overcommit == 1) {
-        vmPoolSize = vmPoolSizeOvercommit;
-        coalesceLimit = coalesceLimitOvercommit;
+    if (fscanf(fp, "%u", &overcommit) == 1) {
+        if (overcommit == 1) {
+            vmPoolSize = vmPoolSizeOvercommit;
+            coalesceLimit = coalesceLimitOvercommit;
+        }
     }
 
     fclose(fp);

-- 
WebKit Debian packaging