Changeset 161338 in webkit


Ignore:
Timestamp:
Jan 6, 2014 3:17:46 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
https://bugs.webkit.org/show_bug.cgi?id=124579

Patch by László Langó <lango@inf.u-szeged.hu> on 2014-01-06
Reviewed by Anders Carlsson.

Source/WebCore:

  • WebCore.exp.in:
  • loader/NetscapePlugInStreamLoader.cpp:

(WebCore::NetscapePlugInStreamLoader::didReceiveData):

  • loader/NetscapePlugInStreamLoader.h:
  • loader/PingLoader.h:
  • loader/ResourceBuffer.cpp:

(WebCore::ResourceBuffer::ResourceBuffer):

  • loader/ResourceBuffer.h:

(WebCore::ResourceBuffer::create):

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::addDataOrBuffer):
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didReceiveDataOrBuffer):
(WebCore::ResourceLoader::willStopBufferingData):

  • loader/ResourceLoader.h:
  • loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::didReceiveData):

  • loader/SubresourceLoader.h:
  • loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::didReceiveData):

  • loader/appcache/ApplicationCacheGroup.h:
  • loader/mac/ResourceLoaderMac.mm:

(WebCore::ResourceLoader::didReceiveDataArray):

  • platform/SharedBuffer.cpp:

(WebCore::SharedBuffer::SharedBuffer):

  • platform/SharedBuffer.h:

(WebCore::SharedBuffer::create):

  • platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(ResourceHandleStreamingClient::didReceiveData):

  • platform/network/BlobResourceHandle.cpp:
  • platform/network/ResourceHandleClient.h:

(WebCore::ResourceHandleClient::didReceiveData):
(WebCore::ResourceHandleClient::willStopBufferingData):

  • platform/network/SynchronousLoaderClient.cpp:

(WebCore::SynchronousLoaderClient::didReceiveData):

  • platform/network/SynchronousLoaderClient.h:
  • platform/network/blackberry/BlobStream.cpp:

(WebCore::BlobStream::didReceiveData):

  • platform/network/blackberry/BlobStream.h:
  • platform/network/blackberry/ResourceHandleBlackBerry.cpp:

(WebCore::WebCoreSynchronousLoader::didReceiveData):

  • platform/network/curl/ResourceHandleCurl.cpp:

(WebCore::WebCoreSynchronousLoader::didReceiveData):

  • platform/network/mac/WebCoreResourceHandleAsDelegate.mm:

(-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):

  • platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:

(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willStopBufferingData:]):

  • platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::WebCoreSynchronousLoader::didReceiveData):

  • platform/network/win/ResourceHandleWin.cpp:

(WebCore::WebCoreSynchronousLoader::didReceiveData):

Source/WebKit/gtk:

  • webkit/webkitdownload.cpp:

(DownloadClient::didReceiveData):

Source/WebKit/win:

  • WebKitDLL.cpp:

(loadResourceIntoBuffer):

Source/WebKit2:

  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didReceiveData):
(WebKit::NetworkResourceLoader::willStopBufferingData):

  • NetworkProcess/NetworkResourceLoader.h:
  • Shared/Downloads/soup/DownloadSoup.cpp:

(WebKit::DownloadClient::didReceiveData):

Location:
trunk/Source
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r161337 r161338  
     12014-01-06  László Langó  <lango@inf.u-szeged.hu>
     2
     3        Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
     4        https://bugs.webkit.org/show_bug.cgi?id=124579
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebCore.exp.in:
     9        * loader/NetscapePlugInStreamLoader.cpp:
     10        (WebCore::NetscapePlugInStreamLoader::didReceiveData):
     11        * loader/NetscapePlugInStreamLoader.h:
     12        * loader/PingLoader.h:
     13        * loader/ResourceBuffer.cpp:
     14        (WebCore::ResourceBuffer::ResourceBuffer):
     15        * loader/ResourceBuffer.h:
     16        (WebCore::ResourceBuffer::create):
     17        * loader/ResourceLoader.cpp:
     18        (WebCore::ResourceLoader::addDataOrBuffer):
     19        (WebCore::ResourceLoader::didReceiveData):
     20        (WebCore::ResourceLoader::didReceiveDataOrBuffer):
     21        (WebCore::ResourceLoader::willStopBufferingData):
     22        * loader/ResourceLoader.h:
     23        * loader/SubresourceLoader.cpp:
     24        (WebCore::SubresourceLoader::didReceiveData):
     25        * loader/SubresourceLoader.h:
     26        * loader/appcache/ApplicationCacheGroup.cpp:
     27        (WebCore::ApplicationCacheGroup::didReceiveData):
     28        * loader/appcache/ApplicationCacheGroup.h:
     29        * loader/mac/ResourceLoaderMac.mm:
     30        (WebCore::ResourceLoader::didReceiveDataArray):
     31        * platform/SharedBuffer.cpp:
     32        (WebCore::SharedBuffer::SharedBuffer):
     33        * platform/SharedBuffer.h:
     34        (WebCore::SharedBuffer::create):
     35        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
     36        (ResourceHandleStreamingClient::didReceiveData):
     37        * platform/network/BlobResourceHandle.cpp:
     38        * platform/network/ResourceHandleClient.h:
     39        (WebCore::ResourceHandleClient::didReceiveData):
     40        (WebCore::ResourceHandleClient::willStopBufferingData):
     41        * platform/network/SynchronousLoaderClient.cpp:
     42        (WebCore::SynchronousLoaderClient::didReceiveData):
     43        * platform/network/SynchronousLoaderClient.h:
     44        * platform/network/blackberry/BlobStream.cpp:
     45        (WebCore::BlobStream::didReceiveData):
     46        * platform/network/blackberry/BlobStream.h:
     47        * platform/network/blackberry/ResourceHandleBlackBerry.cpp:
     48        (WebCore::WebCoreSynchronousLoader::didReceiveData):
     49        * platform/network/curl/ResourceHandleCurl.cpp:
     50        (WebCore::WebCoreSynchronousLoader::didReceiveData):
     51        * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
     52        (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
     53        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
     54        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willStopBufferingData:]):
     55        * platform/network/soup/ResourceHandleSoup.cpp:
     56        (WebCore::WebCoreSynchronousLoader::didReceiveData):
     57        * platform/network/win/ResourceHandleWin.cpp:
     58        (WebCore::WebCoreSynchronousLoader::didReceiveData):
     59
    1602014-01-06  Andreas Kling  <akling@apple.com>
    261
  • trunk/Source/WebCore/WebCore.exp.in

    r161319 r161338  
    234234__ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
    235235__ZN7WebCore12SharedBuffer6appendEPKcj
    236 __ZN7WebCore12SharedBufferC1EPKci
    237 __ZN7WebCore12SharedBufferC1EPKhi
     236__ZN7WebCore12SharedBufferC1EPKcj
     237__ZN7WebCore12SharedBufferC1EPKhj
    238238__ZN7WebCore12SharedBufferC1Ev
    239239__ZN7WebCore12SharedBufferD1Ev
     
    355355__ZN7WebCore14ResourceBuffer12createNSDataEv
    356356__ZN7WebCore14ResourceBuffer6appendEPKcj
    357 __ZN7WebCore14ResourceBufferC1EPKci
     357__ZN7WebCore14ResourceBufferC1EPKcj
    358358__ZN7WebCore14ResourceBufferC1Ev
    359359__ZN7WebCore14ResourceBufferC2Ev
  • trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp

    r154962 r161338  
    9595}
    9696
    97 void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
     97void NetscapePlugInStreamLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
    9898{
    9999    didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
  • trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h

    r145820 r161338  
    5858private:
    5959    virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
    60     virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;
     60    virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE;
    6161    virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE;
    6262    virtual void didFinishLoading(double finishTime) OVERRIDE;
  • trunk/Source/WebCore/loader/PingLoader.h

    r158558 r161338  
    6666
    6767    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE { delete this; }
    68     virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE { delete this; }
     68    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE { delete this; }
    6969    virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE { delete this; }
    7070    virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE { delete this; }
  • trunk/Source/WebCore/loader/ResourceBuffer.cpp

    r160841 r161338  
    3636}
    3737
    38 ResourceBuffer::ResourceBuffer(const char* data, int size)
     38ResourceBuffer::ResourceBuffer(const char* data, unsigned size)
    3939    : m_sharedBuffer(SharedBuffer::create(data, size))
    4040{
  • trunk/Source/WebCore/loader/ResourceBuffer.h

    r160841 r161338  
    4646
    4747    static PassRefPtr<ResourceBuffer> create() { return adoptRef(new ResourceBuffer); }
    48     static PassRefPtr<ResourceBuffer> create(const char* data, int size) { return adoptRef(new ResourceBuffer(data, size)); }
     48    static PassRefPtr<ResourceBuffer> create(const char* data, unsigned size) { return adoptRef(new ResourceBuffer(data, size)); }
    4949    static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer> shared) { return shared ? adoptRef(new ResourceBuffer(shared)) : 0; }
    5050
     
    9595
    9696private:
    97     ResourceBuffer(const char*, int);
     97    ResourceBuffer(const char*, unsigned);
    9898    ResourceBuffer(PassRefPtr<SharedBuffer>);
    9999
  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r160841 r161338  
    207207   
    208208
    209 void ResourceLoader::addDataOrBuffer(const char* data, int length, SharedBuffer* buffer, DataPayloadType dataPayloadType)
     209void ResourceLoader::addDataOrBuffer(const char* data, unsigned length, SharedBuffer* buffer, DataPayloadType dataPayloadType)
    210210{
    211211    if (m_options.dataBufferingPolicy == DoNotBufferData)
     
    308308}
    309309
    310 void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
     310void ResourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
    311311{
    312312    // The following assertions are not quite valid here, since a subclass
     
    324324}
    325325
    326 void ResourceLoader::didReceiveDataOrBuffer(const char* data, int length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
     326void ResourceLoader::didReceiveDataOrBuffer(const char* data, unsigned length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
    327327{
    328328    // This method should only get data+length *OR* a SharedBuffer.
     
    343343}
    344344
    345 void ResourceLoader::willStopBufferingData(const char* data, int length)
     345void ResourceLoader::willStopBufferingData(const char* data, unsigned length)
    346346{
    347347    if (m_options.dataBufferingPolicy == DoNotBufferData)
     
    499499}
    500500
    501 void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
     501void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
    502502{
    503503    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), encodedDataLength);
  • trunk/Source/WebCore/loader/ResourceLoader.h

    r160841 r161338  
    9393    virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
    9494    virtual void didReceiveResponse(const ResourceResponse&);
    95     virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType);
     95    virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType);
    9696    virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
    97     void willStopBufferingData(const char*, int);
     97    void willStopBufferingData(const char*, unsigned);
    9898    virtual void didFinishLoading(double finishTime);
    9999    virtual void didFail(const ResourceError&);
     
    115115    virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
    116116    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
    117     virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;
     117    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE;
    118118    virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength) OVERRIDE;
    119119    virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
     
    122122    virtual void cannotShowURL(ResourceHandle*) OVERRIDE;
    123123#if PLATFORM(MAC)
    124     virtual void willStopBufferingData(ResourceHandle*, const char* data, int length) OVERRIDE { willStopBufferingData(data, length); }
     124    virtual void willStopBufferingData(ResourceHandle*, const char* data, unsigned length) OVERRIDE { willStopBufferingData(data, length); }
    125125#endif
    126126    virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return shouldUseCredentialStorage(); }
     
    172172    bool wasCancelled() const { return m_cancellationStatus >= Cancelled; }
    173173
    174     void didReceiveDataOrBuffer(const char*, int, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
     174    void didReceiveDataOrBuffer(const char*, unsigned, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
    175175
    176176    const ResourceLoaderOptions& options() { return m_options; }
     
    185185    virtual void didCancel(const ResourceError&) = 0;
    186186
    187     void addDataOrBuffer(const char*, int, SharedBuffer*, DataPayloadType);
     187    void addDataOrBuffer(const char*, unsigned, SharedBuffer*, DataPayloadType);
    188188
    189189    ResourceRequest m_request;
  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r160841 r161338  
    246246}
    247247
    248 void SubresourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
     248void SubresourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
    249249{
    250250    didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
  • trunk/Source/WebCore/loader/SubresourceLoader.h

    r160841 r161338  
    6868    virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
    6969    virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
    70     virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;
     70    virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE;
    7171    virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE;
    7272    virtual void didFinishLoading(double finishTime) OVERRIDE;
  • trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

    r157075 r161338  
    596596}
    597597
    598 void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, int length, int encodedDataLength)
     598void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, unsigned length, int encodedDataLength)
    599599{
    600600    UNUSED_PARAM(encodedDataLength);
  • trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h

    r157044 r161338  
    111111
    112112    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
    113     virtual void didReceiveData(ResourceHandle*, const char*, int length, int encodedDataLength) OVERRIDE;
     113    virtual void didReceiveData(ResourceHandle*, const char*, unsigned length, int encodedDataLength) OVERRIDE;
    114114    virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
    115115    virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
  • trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm

    r157007 r161338  
    8080    for (CFIndex i = 0; i < arrayCount; ++i) {
    8181        CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i));
    82         int dataLen = static_cast<int>(CFDataGetLength(data));
     82        unsigned dataLen = static_cast<unsigned>(CFDataGetLength(data));
    8383
    8484        if (m_options.dataBufferingPolicy == BufferData) {
  • trunk/Source/WebCore/platform/SharedBuffer.cpp

    r160792 r161338  
    7676}
    7777
    78 SharedBuffer::SharedBuffer(size_t size)
     78SharedBuffer::SharedBuffer(unsigned size)
    7979    : m_size(size)
    8080    , m_buffer(size)
     
    8888}
    8989
    90 SharedBuffer::SharedBuffer(const char* data, int size)
     90SharedBuffer::SharedBuffer(const char* data, unsigned size)
    9191    : m_size(0)
    9292#if ENABLE(DISK_IMAGE_CACHE)
     
    9797#endif
    9898{
    99     // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
    100     if (size < 0)
    101         CRASH();
    102 
    10399    append(data, size);
    104100}
    105101
    106 SharedBuffer::SharedBuffer(const unsigned char* data, int size)
     102SharedBuffer::SharedBuffer(const unsigned char* data, unsigned size)
    107103    : m_size(0)
    108104#if ENABLE(DISK_IMAGE_CACHE)
     
    113109#endif
    114110{
    115     // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
    116     if (size < 0)
    117         CRASH();
    118 
    119111    append(reinterpret_cast<const char*>(data), size);
    120112}
  • trunk/Source/WebCore/platform/SharedBuffer.h

    r160310 r161338  
    5353public:
    5454    static PassRefPtr<SharedBuffer> create() { return adoptRef(new SharedBuffer); }
    55     static PassRefPtr<SharedBuffer> create(size_t size) { return adoptRef(new SharedBuffer(size)); }
    56     static PassRefPtr<SharedBuffer> create(const char* c, int i) { return adoptRef(new SharedBuffer(c, i)); }
    57     static PassRefPtr<SharedBuffer> create(const unsigned char* c, int i) { return adoptRef(new SharedBuffer(c, i)); }
     55    static PassRefPtr<SharedBuffer> create(unsigned size) { return adoptRef(new SharedBuffer(size)); }
     56    static PassRefPtr<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); }
     57    static PassRefPtr<SharedBuffer> create(const unsigned char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); }
    5858
    5959    static PassRefPtr<SharedBuffer> createWithContentsOfFile(const String& filePath);
     
    169169private:
    170170    SharedBuffer();
    171     explicit SharedBuffer(size_t);
    172     SharedBuffer(const char*, int);
    173     SharedBuffer(const unsigned char*, int);
     171    explicit SharedBuffer(unsigned);
     172    SharedBuffer(const char*, unsigned);
     173    SharedBuffer(const unsigned char*, unsigned);
    174174   
    175175    // Calling this function will force internal segmented buffers
  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r160310 r161338  
    100100        virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&);
    101101        virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    102         virtual void didReceiveData(ResourceHandle*, const char*, int, int);
     102        virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
    103103        virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength);
    104104        virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
     
    11181118}
    11191119
    1120 void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, int length, int)
     1120void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
    11211121{
    11221122    ASSERT_NOT_REACHED();
  • trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

    r156550 r161338  
    8686
    8787    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
    88     virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;
     88    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE;
    8989    virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE;
    9090    virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
     
    118118}
    119119
    120 void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, int, int)
     120void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, unsigned, int)
    121121{
    122122}
  • trunk/Source/WebCore/platform/network/ResourceHandleClient.h

    r160467 r161338  
    6868        virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { }
    6969       
    70         virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) { }
     70        virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { }
    7171        virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength);
    7272       
     
    123123#elif PLATFORM(MAC)
    124124        virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
    125         virtual void willStopBufferingData(ResourceHandle*, const char*, int) { }
     125        virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }
    126126#endif
    127127
  • trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp

    r158504 r161338  
    6868}
    6969
    70 void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, int length, int /*encodedDataLength*/)
     70void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/)
    7171{
    7272    m_data.append(data, length);
  • trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h

    r154893 r161338  
    6161    virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) OVERRIDE;
    6262    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
    63     virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;
     63    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE;
    6464    virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE;
    6565    virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
  • trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp

    r150217 r161338  
    3838}
    3939
    40 void BlobStream::didReceiveData(ResourceHandle*, const char* data, int len, int)
     40void BlobStream::didReceiveData(ResourceHandle*, const char* data, unsigned len, int)
    4141{
    4242    notifyDataReceived(BlackBerry::Platform::createNetworkBufferByWrappingData(data, len));
  • trunk/Source/WebCore/platform/network/blackberry/BlobStream.h

    r150217 r161338  
    3939
    4040    // From class ResourceHandleClient.
    41     virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE;
     41    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE;
    4242    virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE;
    4343    virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
  • trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp

    r151426 r161338  
    4545
    4646    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    47     virtual void didReceiveData(ResourceHandle*, const char*, int, int);
     47    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
    4848    virtual void didFinishLoading(ResourceHandle*, double);
    4949    virtual void didFail(ResourceHandle*, const ResourceError&);
     
    7171}
    7272
    73 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
     73void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
    7474{
    7575    m_data.append(data, length);
  • trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp

    r159587 r161338  
    4949
    5050    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    51     virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
     51    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength);
    5252    virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
    5353    virtual void didFail(ResourceHandle*, const ResourceError&);
     
    7272}
    7373
    74 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
     74void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
    7575{
    7676    m_data.append(data, length);
  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm

    r160498 r161338  
    207207    // However, with today's computers and networking speeds, this won't happen in practice.
    208208    // Could be an issue with a giant local file.
    209     m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length]));
     209    m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
    210210}
    211211
  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm

    r160498 r161338  
    304304        // However, with today's computers and networking speeds, this won't happen in practice.
    305305        // Could be an issue with a giant local file.
    306         m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length]));
     306        m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
    307307    });
    308308}
  • trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r161179 r161338  
    145145    }
    146146
    147     virtual void didReceiveData(ResourceHandle*, const char* /* data */, int /* length */, int)
     147    virtual void didReceiveData(ResourceHandle*, const char* /* data */, unsigned /* length */, int)
    148148    {
    149149        ASSERT_NOT_REACHED();
  • trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp

    r156550 r161338  
    8888
    8989    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    90     virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
     90    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength);
    9191    virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
    9292    virtual void didFail(ResourceHandle*, const ResourceError&);
     
    117117}
    118118
    119 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
     119void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
    120120{
    121121    m_data.append(data, length);
  • trunk/Source/WebKit/gtk/ChangeLog

    r161255 r161338  
     12014-01-06  László Langó  <lango@inf.u-szeged.hu>
     2
     3        Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
     4        https://bugs.webkit.org/show_bug.cgi?id=124579
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * webkit/webkitdownload.cpp:
     9        (DownloadClient::didReceiveData):
     10
    1112014-01-02  Carlos Garcia Campos  <cgarcia@igalia.com>
    212
  • trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp

    r160310 r161338  
    6868
    6969    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    70     virtual void didReceiveData(ResourceHandle*, const char*, int, int);
     70    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
    7171    virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int encodedLength);
    7272    virtual void didFinishLoading(ResourceHandle*, double);
     
    942942}
    943943
    944 void DownloadClient::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
     944void DownloadClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
    945945{
    946946    ASSERT_NOT_REACHED();
  • trunk/Source/WebKit/win/ChangeLog

    r161166 r161338  
     12014-01-06  László Langó  <lango@inf.u-szeged.hu>
     2
     3        Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
     4        https://bugs.webkit.org/show_bug.cgi?id=124579
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebKitDLL.cpp:
     9        (loadResourceIntoBuffer):
     10
    1112013-12-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    212
  • trunk/Source/WebKit/win/WebKitDLL.cpp

    r82284 r161338  
    203203    if (!resource)
    204204        return 0;
    205     int size = SizeofResource(gInstance, resInfo);
     205    unsigned size = SizeofResource(gInstance, resInfo);
    206206
    207207    return WebCore::SharedBuffer::create(reinterpret_cast<const char*>(resource), size);
  • trunk/Source/WebKit2/ChangeLog

    r161329 r161338  
     12014-01-06  László Langó  <lango@inf.u-szeged.hu>
     2
     3        Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
     4        https://bugs.webkit.org/show_bug.cgi?id=124579
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * NetworkProcess/NetworkResourceLoader.cpp:
     9        (WebKit::NetworkResourceLoader::didReceiveData):
     10        (WebKit::NetworkResourceLoader::willStopBufferingData):
     11        * NetworkProcess/NetworkResourceLoader.h:
     12        * Shared/Downloads/soup/DownloadSoup.cpp:
     13        (WebKit::DownloadClient::didReceiveData):
     14
    1152014-01-04  Simon Fraser  <simon.fraser@apple.com>
    216
  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r161148 r161338  
    192192}
    193193
    194 void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
     194void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
    195195{
    196196    // The NetworkProcess should never get a didReceiveData callback.
     
    399399
    400400#if PLATFORM(MAC)
    401 void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, int)
     401void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
    402402{
    403403    notImplemented();
  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r161148 r161338  
    8383    virtual void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
    8484    virtual void didReceiveResponseAsync(WebCore::ResourceHandle*, const WebCore::ResourceResponse&) OVERRIDE;
    85     virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;
     85    virtual void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE;
    8686    virtual void didReceiveBuffer(WebCore::ResourceHandle*, PassRefPtr<WebCore::SharedBuffer>, int encodedDataLength) OVERRIDE;
    8787    virtual void didFinishLoading(WebCore::ResourceHandle*, double finishTime) OVERRIDE;
     
    109109    virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE;
    110110#endif
    111     virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, int) OVERRIDE;
     111    virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
    112112#endif // PLATFORM(MAC)
    113113
  • trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp

    r161156 r161338  
    111111    }
    112112
    113     void didReceiveData(ResourceHandle*, const char* data, int length, int /*encodedDataLength*/)
     113    void didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/)
    114114    {
    115115        if (m_handleResponseLaterID) {
Note: See TracChangeset for help on using the changeset viewer.