walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make blob unlocking 64bit-safe 

GNOME Bug 604128 - Applications crash when displaying Hebrew characters
This commit is contained in:
Behdad Esfahbod 2010-02-23 16:47:51 -05:00
parent ecd2e996d2
commit 917c227500
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-blob.c
View File

@ -250,18 +250,18 @@ static hb_bool_t
_try_make_writable_inplace_unix_locked (hb_blob_t *blob) _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
{ {
#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT)
unsigned int pagesize = -1, mask, length; uintptr_t pagesize = -1, mask, length;
const char *addr; const char *addr;
#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) #if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
pagesize = (unsigned int) sysconf (_SC_PAGE_SIZE); pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE);
#elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) #elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
pagesize = (unsigned int) sysconf (_SC_PAGESIZE); pagesize = (uintptr_t) sysconf (_SC_PAGESIZE);
#elif defined(HAVE_GETPAGESIZE) #elif defined(HAVE_GETPAGESIZE)
pagesize = (unsigned int) getpagesize (); pagesize = (uintptr_t) getpagesize ();
#endif #endif
if ((unsigned int) -1 == pagesize) { if ((uintptr_t) -1L == pagesize) {
#if HB_DEBUG_BLOB #if HB_DEBUG_BLOB
fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno)); fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno));
#endif #endif
@ -272,8 +272,8 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
#endif #endif
mask = ~(pagesize-1); mask = ~(pagesize-1);
addr = (const char *) (((size_t) blob->data) & mask); addr = (const char *) (((uintptr_t) blob->data) & mask);
length = (const char *) (((size_t) blob->data + blob->length + pagesize-1) & mask) - addr; length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr;
#if HB_DEBUG_BLOB #if HB_DEBUG_BLOB
fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n", fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n",
blob, __FUNCTION__, blob, __FUNCTION__,