From f0599db761d7fc2d585d86e757a797f75ebc7499 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 5 Nov 2015 23:52:41 -0800 Subject: [PATCH] Fix hang in OOM situations Fixes https://github.com/behdad/harfbuzz/issues/161 --- src/hb-buffer-private.hh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh index 8d9ae7c40..ecebb3e0b 100644 --- a/src/hb-buffer-private.hh +++ b/src/hb-buffer-private.hh @@ -174,7 +174,11 @@ struct hb_buffer_t { if (have_output) { if (unlikely (out_info != info || out_len != idx)) { - if (unlikely (!make_room_for (1, 1))) return; + if (unlikely (!make_room_for (1, 1))) + { + idx++; // So we don't hang indefinitely... + return; + } out_info[out_len] = info[idx]; } out_len++;