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

Rename check to check_range

This commit is contained in:
Behdad Esfahbod 2010-05-06 09:24:24 -04:00
parent 1cd1e117d0
commit 4ad2cc5dec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-open-type-private.hh
View File

@ -181,14 +181,14 @@ struct hb_sanitize_context_t
this->start = this->end = NULL; this->start = this->end = NULL;
} }
inline bool check (const void *base, unsigned int len) const inline bool check_range (const void *base, unsigned int len) const
{ {
bool ret = this->start <= base && bool ret = this->start <= base &&
base <= this->end && base <= this->end &&
(unsigned int) (this->end - CharP(base)) >= len; (unsigned int) (this->end - CharP(base)) >= len;
if (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE) \ if (HB_DEBUG_SANITIZE && (int) this->debug_depth < (int) HB_DEBUG_SANITIZE) \
fprintf (stderr, "SANITIZE(%p) %-*d-> check [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ fprintf (stderr, "SANITIZE(%p) %-*d-> range [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \
base, base,
this->debug_depth, this->debug_depth, this->debug_depth, this->debug_depth,
base, CharP(base)+len, len, base, CharP(base)+len, len,
@ -211,7 +211,7 @@ struct hb_sanitize_context_t
this->start, this->end, this->start, this->end,
!overflows ? "does not overflow" : "OVERFLOWS FAIL"); !overflows ? "does not overflow" : "OVERFLOWS FAIL");
return likely (!overflows && this->check (base, record_size * len)); return likely (!overflows && this->check_range (base, record_size * len));
} }
inline bool can_edit (const char *base HB_UNUSED, unsigned int len HB_UNUSED) inline bool can_edit (const char *base HB_UNUSED, unsigned int len HB_UNUSED)
@ -244,7 +244,7 @@ struct hb_sanitize_context_t
#define SANITIZE_SELF() SANITIZE_MEM(this, sizeof (*this)) #define SANITIZE_SELF() SANITIZE_MEM(this, sizeof (*this))
#define SANITIZE_MEM(B,L) likely (context->check (CharP(B), (L))) #define SANITIZE_MEM(B,L) likely (context->check_range (CharP(B), (L)))
/* Template to sanitize an object. */ /* Template to sanitize an object. */