Title: [184167] releases/WebKitGTK/webkit-2.8/Source
Revision
184167
Author
[email protected]
Date
2015-05-12 01:00:57 -0700 (Tue, 12 May 2015)

Log Message

Merge r183740 - [ARM] Don't compare unsigned chars to EOF (-1)
https://bugs.webkit.org/show_bug.cgi?id=144439

Reviewed by Geoffrey Garen.

Source/WebCore:

* platform/linux/MemoryPressureHandlerLinux.cpp:
(WebKit::nextToken): Don't cast return value of fgetc() to char.

Source/WebKit2:

* Shared/linux/WebMemorySamplerLinux.cpp:
(WebKit::nextToken): Don't cast return value of fgetc() to char.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184166 => 184167)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-05-12 07:59:14 UTC (rev 184166)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-05-12 08:00:57 UTC (rev 184167)
@@ -1,3 +1,13 @@
+2015-05-04  Csaba Osztrogonác  <[email protected]>
+
+        [ARM] Don't compare unsigned chars to EOF (-1)
+        https://bugs.webkit.org/show_bug.cgi?id=144439
+
+        Reviewed by Geoffrey Garen.
+
+        * platform/linux/MemoryPressureHandlerLinux.cpp:
+        (WebKit::nextToken): Don't cast return value of fgetc() to char.
+
 2015-05-03  Carlos Garcia Campos  <[email protected]>
 
         [GTK] API tests crashing on debug builds due to extra unref

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (184166 => 184167)


--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2015-05-12 07:59:14 UTC (rev 184166)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2015-05-12 08:00:57 UTC (rev 184167)
@@ -65,7 +65,7 @@
     char buffer[bufferSize] = {0, };
     unsigned index = 0;
     while (index < bufferSize) {
-        char ch = fgetc(file);
+        int ch = fgetc(file);
         if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
             break;
         if (!isASCIISpace(ch)) {

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (184166 => 184167)


--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-05-12 07:59:14 UTC (rev 184166)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-05-12 08:00:57 UTC (rev 184167)
@@ -1,3 +1,13 @@
+2015-05-04  Csaba Osztrogonác  <[email protected]>
+
+        [ARM] Don't compare unsigned chars to EOF (-1)
+        https://bugs.webkit.org/show_bug.cgi?id=144439
+
+        Reviewed by Geoffrey Garen.
+
+        * Shared/linux/WebMemorySamplerLinux.cpp:
+        (WebKit::nextToken): Don't cast return value of fgetc() to char.
+
 2015-05-01  Dan Bernstein  <[email protected]>
 
         WebKit2 part of <rdar://problem/8636045> Back/forward navigation to an error page in Safari breaks the back-forward list

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp (184166 => 184167)


--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp	2015-05-12 07:59:14 UTC (rev 184166)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp	2015-05-12 08:00:57 UTC (rev 184167)
@@ -66,7 +66,7 @@
     char buffer[maxBuffer] = {0, };
     unsigned int index = 0;
     while (index < maxBuffer) {
-        char ch = fgetc(file);
+        int ch = fgetc(file);
         if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
             break;
         if (!isASCIISpace(ch)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to