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

[sanitize] Make debug code always available to the compiler 

Such that we don't break debug build all the time.
This commit is contained in:
Behdad Esfahbod 2010-04-29 13:48:26 -04:00
parent fde6f5bd68
commit fa030175ca
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,20 +155,18 @@ _hb_sanitize_init (hb_sanitize_context_t *context,
context->writable = hb_blob_is_writable (blob); context->writable = hb_blob_is_writable (blob);
context->edit_count = 0; context->edit_count = 0;
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n", fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n",
blob, context->start, context->end, context->end - context->start); blob, context->start, context->end, context->end - context->start);
#endif
} }
static HB_GNUC_UNUSED void static HB_GNUC_UNUSED void
_hb_sanitize_fini (hb_sanitize_context_t *context HB_GNUC_UNUSED, _hb_sanitize_fini (hb_sanitize_context_t *context HB_GNUC_UNUSED,
hb_blob_t *blob) hb_blob_t *blob)
{ {
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n", fprintf (stderr, "sanitize %p fini [%p..%p] %u edit requests\n",
blob, context->start, context->end, context->edit_count); blob, context->start, context->end, context->edit_count);
#endif
hb_blob_unlock (blob); hb_blob_unlock (blob);
} }
@ -182,15 +180,14 @@ _hb_sanitize_check (SANITIZE_ARG_DEF,
base <= context->end && base <= context->end &&
(unsigned int) (context->end - base) >= len; (unsigned int) (context->end - base) >= len;
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE && (int) sanitize_depth < (int) HB_DEBUG_SANITIZE) \
if (sanitize_depth < HB_DEBUG_SANITIZE) \
fprintf (stderr, "SANITIZE(%p) %-*d-> check [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ fprintf (stderr, "SANITIZE(%p) %-*d-> check [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \
base, base,
sanitize_depth, sanitize_depth, sanitize_depth, sanitize_depth,
base, base+len, len, base, base+len, len,
context->start, context->end, context->start, context->end,
ret ? "pass" : "FAIL"); ret ? "pass" : "FAIL");
#endif
return ret; return ret;
} }
@ -202,15 +199,14 @@ _hb_sanitize_array (SANITIZE_ARG_DEF,
{ {
bool overflows = len >= ((unsigned int) -1) / record_size; bool overflows = len >= ((unsigned int) -1) / record_size;
#if HB_DEBUG_SANITIZE
if (sanitize_depth < HB_DEBUG_SANITIZE) \ if (HB_DEBUG_SANITIZE && (int) sanitize_depth < (int) HB_DEBUG_SANITIZE)
fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", \ fprintf (stderr, "SANITIZE(%p) %-*d-> array [%p..%p] (%d*%d=%ld bytes) in [%p..%p] -> %s\n", \
base, base,
sanitize_depth, sanitize_depth, sanitize_depth, sanitize_depth,
base, base + (record_size * len), record_size, len, (unsigned long) record_size * len, base, base + (record_size * len), record_size, len, (unsigned long) record_size * len,
context->start, context->end, context->start, context->end,
!overflows ? "does not overflow" : "OVERFLOWS FAIL"); !overflows ? "does not overflow" : "OVERFLOWS FAIL");
#endif
return HB_LIKELY (!overflows) && _hb_sanitize_check (SANITIZE_ARG, base, record_size * len); return HB_LIKELY (!overflows) && _hb_sanitize_check (SANITIZE_ARG, base, record_size * len);
} }
@ -222,7 +218,7 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
{ {
context->edit_count++; context->edit_count++;
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE && (int) sanitize_depth < (int) HB_DEBUG_SANITIZE)
fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \ fprintf (stderr, "SANITIZE(%p) %-*d-> edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s\n", \
base, base,
sanitize_depth, sanitize_depth, sanitize_depth, sanitize_depth,
@ -230,7 +226,6 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
base, base+len, len, base, base+len, len,
context->start, context->end, context->start, context->end,
context->writable ? "granted" : "REJECTED"); context->writable ? "granted" : "REJECTED");
#endif
return context->writable; return context->writable;
} }
@ -270,9 +265,8 @@ struct Sanitizer
/* TODO is_sane() stuff */ /* TODO is_sane() stuff */
retry: retry:
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "Sanitizer %p start %s\n", blob, __PRETTY_FUNCTION__); fprintf (stderr, "Sanitizer %p start %s\n", blob, __PRETTY_FUNCTION__);
#endif
_hb_sanitize_init (context, blob); _hb_sanitize_init (context, blob);
@ -281,18 +275,17 @@ struct Sanitizer
sane = t->sanitize (SANITIZE_ARG); sane = t->sanitize (SANITIZE_ARG);
if (sane) { if (sane) {
if (context->edit_count) { if (context->edit_count) {
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "Sanitizer %p passed first round with %d edits; doing a second round %s\n", fprintf (stderr, "Sanitizer %p passed first round with %d edits; doing a second round %s\n",
blob, context->edit_count, __PRETTY_FUNCTION__); blob, context->edit_count, __PRETTY_FUNCTION__);
#endif
/* sanitize again to ensure no toe-stepping */ /* sanitize again to ensure no toe-stepping */
context->edit_count = 0; context->edit_count = 0;
sane = t->sanitize (SANITIZE_ARG); sane = t->sanitize (SANITIZE_ARG);
if (context->edit_count) { if (context->edit_count) {
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "Sanitizer %p requested %d edits in second round; FAILLING %s\n", fprintf (stderr, "Sanitizer %p requested %d edits in second round; FAILLING %s\n",
blob, context->edit_count, __PRETTY_FUNCTION__); blob, context->edit_count, __PRETTY_FUNCTION__);
#endif
sane = false; sane = false;
} }
} }
@ -302,16 +295,14 @@ struct Sanitizer
_hb_sanitize_fini (context, blob); _hb_sanitize_fini (context, blob);
if (edit_count && !hb_blob_is_writable (blob) && hb_blob_try_writable (blob)) { if (edit_count && !hb_blob_is_writable (blob) && hb_blob_try_writable (blob)) {
/* ok, we made it writable by relocating. try again */ /* ok, we made it writable by relocating. try again */
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "Sanitizer %p retry %s\n", blob, __PRETTY_FUNCTION__); fprintf (stderr, "Sanitizer %p retry %s\n", blob, __PRETTY_FUNCTION__);
#endif
goto retry; goto retry;
} }
} }
#if HB_DEBUG_SANITIZE if (HB_DEBUG_SANITIZE)
fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "FAILED", __PRETTY_FUNCTION__); fprintf (stderr, "Sanitizer %p %s %s\n", blob, sane ? "passed" : "FAILED", __PRETTY_FUNCTION__);
#endif
if (sane) if (sane)
return blob; return blob;
else { else {