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

I keep changing my mind about this

Browse Source
This commit is contained in:
Behdad Esfahbod 2010-05-05 00:26:16 -04:00
parent 39840474af
commit 27e302dc8e
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ struct hb_sanitize_context_t
this->start, this->end, this->start, this->end,
ret ? "pass" : "FAIL"); ret ? "pass" : "FAIL");
return ret; return likely (ret);
} }
inline bool check_array (const char *base, unsigned int record_size, unsigned int len) const inline bool check_array (const char *base, unsigned int record_size, unsigned int len) const
@ -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 (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)
@ -230,21 +230,11 @@ struct hb_sanitize_context_t
return this->writable; return this->writable;
} }
inline const char *get_start (void) const { return start; }
inline const char *get_end (void) const { return end; }
inline bool is_writable (void) const { return writable; }
inline unsigned int get_edit_count (void) const { return this->edit_count; }
inline void reset_edit_count (void) { this->edit_count = 0; }
public:
unsigned int debug_depth;
private:
const char *start, *end; const char *start, *end;
bool writable; bool writable;
unsigned int edit_count; unsigned int edit_count;
hb_blob_t *blob; hb_blob_t *blob;
unsigned int debug_depth;
}; };
@ -275,28 +265,28 @@ struct Sanitizer
context->init (blob); context->init (blob);
Type *t = CastP<Type> (const_cast<char *> (context->get_start ())); Type *t = CastP<Type> (const_cast<char *> (context->start));
sane = t->sanitize (context); sane = t->sanitize (context);
if (sane) { if (sane) {
if (context->get_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->get_edit_count (), HB_FUNC); blob, context->edit_count, HB_FUNC);
/* sanitize again to ensure no toe-stepping */ /* sanitize again to ensure no toe-stepping */
context->reset_edit_count (); context->edit_count = 0;
sane = t->sanitize (context); sane = t->sanitize (context);
if (context->get_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->get_edit_count (), HB_FUNC); blob, context->edit_count, HB_FUNC);
sane = false; sane = false;
} }
} }
context->finish (); context->finish ();
} else { } else {
unsigned int edit_count = context->get_edit_count (); unsigned int edit_count = context->edit_count;
context->finish (); context->finish ();
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 */