diff options
| -rw-r--r-- | webkit/glue/webcursor.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webcursor_win.cc | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc index 72ede41..3be9cc2 100644 --- a/webkit/glue/webcursor.cc +++ b/webkit/glue/webcursor.cc @@ -88,6 +88,9 @@ bool WebCursor::Deserialize(const Pickle* pickle, void** iter) { size_y > kMaxCursorDimension) return false; + if (type == WebCursorInfo::TypeCustom && (size_x == 0 || size_y == 0)) + return false; + // The * 4 is because the expected format is an array of RGBA pixel values. if (size_x * size_y * 4 > data_len) return false; @@ -168,7 +171,8 @@ void WebCursor::SetCustomData(const WebImage& image) { const SkBitmap& bitmap = image.getSkBitmap(); SkAutoLockPixels bitmap_lock(bitmap); custom_data_.resize(bitmap.getSize()); - memcpy(&custom_data_[0], bitmap.getPixels(), bitmap.getSize()); + if (!custom_data_.empty()) + memcpy(&custom_data_[0], bitmap.getPixels(), bitmap.getSize()); custom_size_.set_width(bitmap.width()); custom_size_.set_height(bitmap.height()); } diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index c1d7556..8331c7a 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -158,9 +158,10 @@ HCURSOR WebCursor::GetCursor(HINSTANCE module_handle){ HDC workingDC = CreateCompatibleDC(dc); HBITMAP bitmap_handle = CreateDIBSection( dc, &cursor_bitmap_info, DIB_RGB_COLORS, 0, 0, 0); - SetDIBits( - 0, bitmap_handle, 0, custom_size_.height(), &custom_data_[0], - &cursor_bitmap_info, DIB_RGB_COLORS); + if (!custom_data_.empty()) + SetDIBits( + 0, bitmap_handle, 0, custom_size_.height(), &custom_data_[0], + &cursor_bitmap_info, DIB_RGB_COLORS); HBITMAP old_bitmap = reinterpret_cast<HBITMAP>( SelectObject(workingDC, bitmap_handle)); |