From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Pip Cet Newsgroups: gmane.emacs.diffs,gmane.emacs.devel Subject: Re: emacs-27 41232e6: Avoid crashes due to bidi cache being reset during redisplay Date: Sun, 31 May 2020 14:44:54 +0000 Message-ID: References: <20200531142645.22884.78754@vcs0.savannah.gnu.org> <20200531142647.08FCA20A2B@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="117752"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-diffs@gnu.org To: emacs-devel@gnu.org, Eli Zaretskii Original-X-From: emacs-diffs-bounces+gnu-emacs-diffs=m.gmane-mx.org@gnu.org Sun May 31 16:45:42 2020 Return-path: Envelope-to: gnu-emacs-diffs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jfPDa-000UY7-4w for gnu-emacs-diffs@m.gmane-mx.org; Sun, 31 May 2020 16:45:42 +0200 Original-Received: from localhost ([::1]:34300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfPDZ-0001Cm-6e for gnu-emacs-diffs@m.gmane-mx.org; Sun, 31 May 2020 10:45:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfPDT-0001AZ-Fq; Sun, 31 May 2020 10:45:35 -0400 Original-Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:39909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfPDS-0006H1-Jg; Sun, 31 May 2020 10:45:35 -0400 Original-Received: by mail-oi1-x233.google.com with SMTP id d67so1839243oig.6; Sun, 31 May 2020 07:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qqzPDtduYa/qjel7r94Cab8k+MvdlwYA+/M+3S6NO7Q=; b=iv110XssH7PYT+u4JmMSdD83mPn+9fyXmjT4EDqTJ5mRU4Naz3peb+3PigkQs7mTEq zdVQIKvRPSjVaSpPXDYYLUti5rRQ4bziAiVfAqOkOS+yD19u4ooEVlqDtd28IYvOanXo sdK1nseNQ9DRkxivfYutMBzL9r++hIUY5smgvRVgutaEdlCu+77QZyShvWnOVrwJ5MPF ExJOJCkIoN7GqMQH9tfbhrQ8ACP1K5Q3UeSj4hcR2DZ84ymE1/5/y6pCS6ZlLFbf7KG7 8YSskbDK8GGhx8YNwKJ0tGNU5zLaxeahu/bgKB4TT9wtD/v7z57Yao9upi86mEOL2CpE TwfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qqzPDtduYa/qjel7r94Cab8k+MvdlwYA+/M+3S6NO7Q=; b=si0OmTzA1x8uydjdgpBgH6eKDy5rQMRDCwJIM6hsty2o9sv4LiHGWGmUadzrFIUno9 OCpTFqjWx52QGCogyJiv2yKSwPOYuYuoi57tGGdy4PuBLzpPm2uWg1HJQDSK2DcDMMjM bfrg9x9T6LksCekqbWpMXbcXZ0iHxpQZONPBN81SPmFJY9bIkWtfqDgki5uNQuI+FwA1 d8arZdK4rYRGjJ4Ey0lhvpHFEVsjYN7CEnXw/F1/FzpHCXNN6cp+Pne4QVflvvZuo36u pMz25fRf4/Id75/MrusnRslfDWShmP234LXLiFs6atPzIPR2XlhorE0coC5AOMfbsUws NLfw== X-Gm-Message-State: AOAM530wkCevm8mtNLfC+VXRfMjFsHCShfVmSnV7v3Gv4Pf++RJSgYI2 I8OoXfjfh1OokBpa/RDktg7iSdngf6+UzxK6zAIcFb9l X-Google-Smtp-Source: ABdhPJwj02iBWxP1ZofQlXCK0Fskxq834JqwA89GtD1Mq5xi5M+6zqtCkBkOWPocimkor0dJcrCvgGFvBn4DYXkUF2E= X-Received: by 2002:aca:4e0d:: with SMTP id c13mr1172255oib.30.1590936331830; Sun, 31 May 2020 07:45:31 -0700 (PDT) In-Reply-To: <20200531142647.08FCA20A2B@vcs0.savannah.gnu.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::233; envelope-from=pipcet@gmail.com; helo=mail-oi1-x233.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: emacs-diffs@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for Emacs changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-diffs-bounces+gnu-emacs-diffs=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-diffs" Xref: news.gmane.io gmane.emacs.diffs:156394 gmane.emacs.devel:251676 Archived-At: On Sun, May 31, 2020 at 2:26 PM Eli Zaretskii wrote: > diff --git a/src/xdisp.c b/src/xdisp.c > index bff6218..60848f4 100644 > --- a/src/xdisp.c > +++ b/src/xdisp.c > @@ -11539,7 +11539,9 @@ display_echo_area_1 (ptrdiff_t a1, Lisp_Object a2) > /* Display. */ > clear_glyph_matrix (w->desired_matrix); > XSETWINDOW (window, w); > + void *itdata = bidi_shelve_cache (); But what if we're out of memory? bidi_shelve_cache will call xmalloc... (Playing around with this, the composition code also tries to allocate memory when I call memory_full.)