Changeset 65219 in webkit
- Timestamp:
- Aug 11, 2010 11:31:30 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r65218 r65219 1 2010-08-11 Fumitoshi Ukai <ukai@chromium.org> 2 3 Reviewed by Alexey Proskuryakov. 4 5 REGRESSION(65135): format specifier warnings 6 https://bugs.webkit.org/show_bug.cgi?id=43876 7 8 * websockets/WebSocketChannel.cpp: 9 (WebCore::WebSocketChannel::appendToBuffer): cast size_t to unsigned long for %lu. 10 (WebCore::WebSocketChannel::processBuffer): cast size_t to unsigned long for %lu. 11 1 12 2010-08-11 Kevin Ollivier <kevino@theolliviers.com> 2 13 -
trunk/WebCore/websockets/WebSocketChannel.cpp
r65140 r65219 203 203 size_t newBufferSize = m_bufferSize + len; 204 204 if (newBufferSize < m_bufferSize) { 205 LOG(Network, "WebSocket buffer overflow (%lu+%lu)", m_bufferSize, len);205 LOG(Network, "WebSocket buffer overflow (%lu+%lu)", static_cast<unsigned long>(m_bufferSize), static_cast<unsigned long>(len)); 206 206 return false; 207 207 } … … 216 216 return true; 217 217 } 218 m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, String::format("WebSocket frame (at %lu bytes) is too long.", newBufferSize), 0, m_handshake.clientOrigin());218 m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, String::format("WebSocket frame (at %lu bytes) is too long.", static_cast<unsigned long>(newBufferSize)), 0, m_handshake.clientOrigin()); 219 219 return false; 220 220 } … … 256 256 skipBuffer(headerLength); 257 257 m_client->didConnect(); 258 LOG(Network, "remaining in read buf %lu", m_bufferSize);258 LOG(Network, "remaining in read buf %lu", static_cast<unsigned long>(m_bufferSize)); 259 259 return m_buffer; 260 260 } … … 278 278 while (p < end) { 279 279 if (length > std::numeric_limits<size_t>::max() / 128) { 280 LOG(Network, "frame length overflow %lu", length);280 LOG(Network, "frame length overflow %lu", static_cast<unsigned long>(length)); 281 281 errorFrame = true; 282 282 break; … … 286 286 unsigned int lengthMsgByte = msgByte & 0x7f; 287 287 if (newLength > std::numeric_limits<size_t>::max() - lengthMsgByte) { 288 LOG(Network, "frame length overflow %lu+%u", newLength, lengthMsgByte);288 LOG(Network, "frame length overflow %lu+%u", static_cast<unsigned long>(newLength), lengthMsgByte); 289 289 errorFrame = true; 290 290 break; … … 292 292 newLength += lengthMsgByte; 293 293 if (newLength < length) { // sanity check 294 LOG(Network, "frame length integer wrap %lu->%lu", length, newLength);294 LOG(Network, "frame length integer wrap %lu->%lu", static_cast<unsigned long>(length), static_cast<unsigned long>(newLength)); 295 295 errorFrame = true; 296 296 break; … … 302 302 } 303 303 if (p + length < p) { 304 LOG(Network, "frame buffer pointer wrap %p+%lu->%p", p, length, p + length);304 LOG(Network, "frame buffer pointer wrap %p+%lu->%p", p, static_cast<unsigned long>(length), p + length); 305 305 errorFrame = true; 306 306 }
Note: See TracChangeset
for help on using the changeset viewer.