Changeset 75992 in webkit

Timestamp:

Jan 17, 2011 7:10:32 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-17 Jarred Nicholls <​jarred@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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocatorFixedVMPool.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-17  Jarred Nicholls  <jarred@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@apple.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -462 +462 @@
 
     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;
+        }
     }