Merge "Fix SIGBUG due to misalignment" into jb-mr1-dev

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
index 5083222..2a7db11 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
@@ -902,9 +902,9 @@ void PlatformGraphicsContextRecording::drawPosText(const void* inText, size_t by
     }
     FloatRect bounds = approximateTextBounds(byteLength / sizeof(uint16_t), inPos, inPaint);
     const SkPaint* paint = mRecording->recording()->getSkPaint(inPaint);
-    int posSize = sizeof(SkPoint) * paint->countText(inText, byteLength);
-    void* text = heap()->alloc(posSize + byteLength);
-    SkPoint* pos = (SkPoint*) ((char*)text + byteLength);
+    size_t posSize = sizeof(SkPoint) * paint->countText(inText, byteLength);
+    void* text = heap()->alloc(byteLength);
+    SkPoint* pos = (SkPoint*) heap()->alloc(posSize);
     memcpy(text, inText, byteLength);
     memcpy(pos, inPos, posSize);
     appendDrawingOperation(NEW_OP(DrawPosText)(text, byteLength, pos, paint), bounds);