From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16336 invoked by alias); 23 Aug 2014 14:53:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 16309 invoked by uid 89); 23 Aug 2014 14:53:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-vc0-f177.google.com Received: from mail-vc0-f177.google.com (HELO mail-vc0-f177.google.com) (209.85.220.177) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 23 Aug 2014 14:53:19 +0000 Received: by mail-vc0-f177.google.com with SMTP id hy4so13492854vcb.36 for ; Sat, 23 Aug 2014 07:53:17 -0700 (PDT) X-Received: by 10.52.26.206 with SMTP id n14mr1129725vdg.0.1408805596970; Sat, 23 Aug 2014 07:53:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.111.197 with HTTP; Sat, 23 Aug 2014 07:52:35 -0700 (PDT) From: Steven Bosscher Date: Sat, 23 Aug 2014 14:53:00 -0000 Message-ID: Subject: [patch] PR fortran/61669 To: "fortran@gcc.gnu.org" , GCC Patches Content-Type: multipart/mixed; boundary=20cf3079bd4e2a59da05014d1d8d X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg02247.txt.bz2 --20cf3079bd4e2a59da05014d1d8d Content-Type: text/plain; charset=UTF-8 Content-length: 374 Hello, This bug is an error recovery issue. A data declaration is parsed and accepted, and added to gfc_current_ns->data, but the statement is rejected. The rejected data decl is not rolled back, causing memory corruption later on. Proposed fix is to roll back DATA for rejected statements. Bootstrapped&tested on powerpc64-unknown-linux-gnu. OK for trunk? Ciao! Steven --20cf3079bd4e2a59da05014d1d8d Content-Type: text/plain; charset=US-ASCII; name="pr61669.diff" Content-Disposition: attachment; filename="pr61669.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hz72fhxf0 Content-length: 4376 Zm9ydHJhbi8KCVBSIGZvcnRyYW4vNjE2NjkKCSogZ2ZvcnRyYW4uaCAoc3Ry dWN0IGdmY19uYW1lc3BhY2UpOiBBZGQgT0xEX0RBVEEgZmllbGQuCgkqIGRl Y2wuYyAoZ2ZjX3JlamVjdF9kYXRhKTogTmV3IGZ1bmN0aW9uLgoJKiBwYXJz ZS5jICp1c2VfbW9kdWxlcyk6IFJlY29yZCByb2xsLWJhY2sgcG9pbnQuCgko bmV4dF9zdGF0ZW1lbnQpOiBMaWtld2lzZS4KCShyZWplY3Rfc3RhdGVtZW50 KTogUm9sbCBiYWNrIHRvIGxhc3QgYWNjZXB0ZWQgREFUQS4KCnRlc3RzdWl0 ZS8KCVBSIGZvcnRyYW4vNjE2NjkKCSogZ2ZvcnRyYW4uZGcvcHI2MTY2OS5m OTA6IE5ldyB0ZXN0LgoKSW5kZXg6IGZvcnRyYW4vZ2ZvcnRyYW4uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBmb3J0cmFuL2dmb3J0cmFuLmgJKHJl dmlzaW9uIDIxNDM1MCkKKysrIGZvcnRyYW4vZ2ZvcnRyYW4uaAkod29ya2lu ZyBjb3B5KQpAQCAtMTYyNSw3ICsxNjI1LDcgQEAgdHlwZWRlZiBzdHJ1Y3Qg Z2ZjX25hbWVzcGFjZQogICBnZmNfc3RfbGFiZWwgKnN0X2xhYmVsczsKICAg LyogVGhpcyBsaXN0IGhvbGRzIGluZm9ybWF0aW9uIGFib3V0IGFsbCB0aGUg ZGF0YSBpbml0aWFsaXplcnMgaW4KICAgICAgdGhpcyBuYW1lc3BhY2UuICAq LwotICBzdHJ1Y3QgZ2ZjX2RhdGEgKmRhdGE7CisgIHN0cnVjdCBnZmNfZGF0 YSAqZGF0YSwgKm9sZF9kYXRhOwogCiAgIGdmY19jaGFybGVuICpjbF9saXN0 LCAqb2xkX2NsX2xpc3Q7CiAKQEAgLTI5NDEsNiArMjk0MSw3IEBAIHZvaWQg Z2ZjX2ZyZWVfb21wX25hbWVsaXN0IChnZmNfb21wX25hbWVsaXN0ICopOwog dm9pZCBnZmNfZnJlZV9lcXVpdiAoZ2ZjX2VxdWl2ICopOwogdm9pZCBnZmNf ZnJlZV9lcXVpdl91bnRpbCAoZ2ZjX2VxdWl2ICosIGdmY19lcXVpdiAqKTsK IHZvaWQgZ2ZjX2ZyZWVfZGF0YSAoZ2ZjX2RhdGEgKik7Cit2b2lkIGdmY19y ZWplY3RfZGF0YSAoZ2ZjX25hbWVzcGFjZSAqKTsKIHZvaWQgZ2ZjX2ZyZWVf Y2FzZV9saXN0IChnZmNfY2FzZSAqKTsKIAogLyogbWF0Y2hleHAuYyAtLSBG SVhNRSB0b28/ICAqLwpJbmRleDogZm9ydHJhbi9kZWNsLmMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gZm9ydHJhbi9kZWNsLmMJKHJldmlzaW9uIDIx NDM1MCkKKysrIGZvcnRyYW4vZGVjbC5jCSh3b3JraW5nIGNvcHkpCkBAIC0x NzgsNyArMTc4LDIxIEBAIGdmY19mcmVlX2RhdGFfYWxsIChnZmNfbmFtZXNw YWNlICpucykKICAgICB9CiB9CiAKKy8qIFJlamVjdCBkYXRhIHBhcnNlZCBz aW5jZSB0aGUgbGFzdCByZXN0b3JlIHBvaW50IHdhcyBtYXJrZWQuICAqLwog Cit2b2lkCitnZmNfcmVqZWN0X2RhdGEgKGdmY19uYW1lc3BhY2UgKm5zKQor eworICBnZmNfZGF0YSAqZDsKKworICB3aGlsZSAobnMtPmRhdGEgJiYgbnMt PmRhdGEgIT0gbnMtPm9sZF9kYXRhKQorICAgIHsKKyAgICAgIGQgPSBucy0+ ZGF0YS0+bmV4dDsKKyAgICAgIGZyZWUgKG5zLT5kYXRhKTsKKyAgICAgIG5z LT5kYXRhID0gZDsKKyAgICB9Cit9CisKIHN0YXRpYyBtYXRjaCB2YXJfZWxl bWVudCAoZ2ZjX2RhdGFfdmFyaWFibGUgKik7CiAKIC8qIE1hdGNoIGEgbGlz dCBvZiB2YXJpYWJsZXMgdGVybWluYXRlZCBieSBhbiBpdGVyYXRvciBhbmQg YSByaWdodApJbmRleDogZm9ydHJhbi9wYXJzZS5jCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGZvcnRyYW4vcGFyc2UuYwkocmV2aXNpb24gMjE0MzUw KQorKysgZm9ydHJhbi9wYXJzZS5jCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgs NiArMTE4LDcgQEAgdXNlX21vZHVsZXMgKHZvaWQpCiAgIGdmY193YXJuaW5n X2NoZWNrICgpOwogICBnZmNfY3VycmVudF9ucy0+b2xkX2NsX2xpc3QgPSBn ZmNfY3VycmVudF9ucy0+Y2xfbGlzdDsKICAgZ2ZjX2N1cnJlbnRfbnMtPm9s ZF9lcXVpdiA9IGdmY19jdXJyZW50X25zLT5lcXVpdjsKKyAgZ2ZjX2N1cnJl bnRfbnMtPm9sZF9kYXRhID0gZ2ZjX2N1cnJlbnRfbnMtPmRhdGE7CiAgIGxh c3Rfd2FzX3VzZV9zdG10ID0gZmFsc2U7CiB9CiAKQEAgLTEwOTcsNiArMTA5 OCw3IEBAIG5leHRfc3RhdGVtZW50ICh2b2lkKQogCiAgIGdmY19jdXJyZW50 X25zLT5vbGRfY2xfbGlzdCA9IGdmY19jdXJyZW50X25zLT5jbF9saXN0Owog ICBnZmNfY3VycmVudF9ucy0+b2xkX2VxdWl2ID0gZ2ZjX2N1cnJlbnRfbnMt PmVxdWl2OworICBnZmNfY3VycmVudF9ucy0+b2xkX2RhdGEgPSBnZmNfY3Vy cmVudF9ucy0+ZGF0YTsKICAgZm9yICg7OykKICAgICB7CiAgICAgICBnZmNf c3RhdGVtZW50X2xhYmVsID0gTlVMTDsKQEAgLTIwNDUsNiArMjA0Nyw4IEBA IHJlamVjdF9zdGF0ZW1lbnQgKHZvaWQpCiAgIGdmY19mcmVlX2VxdWl2X3Vu dGlsIChnZmNfY3VycmVudF9ucy0+ZXF1aXYsIGdmY19jdXJyZW50X25zLT5v bGRfZXF1aXYpOwogICBnZmNfY3VycmVudF9ucy0+ZXF1aXYgPSBnZmNfY3Vy cmVudF9ucy0+b2xkX2VxdWl2OwogCisgIGdmY19yZWplY3RfZGF0YSAoZ2Zj X2N1cnJlbnRfbnMpOworCiAgIGdmY19uZXdfYmxvY2sgPSBOVUxMOwogICBn ZmNfdW5kb19zeW1ib2xzICgpOwogICBnZmNfY2xlYXJfd2FybmluZyAoKTsK SW5kZXg6IHRlc3RzdWl0ZS9nZm9ydHJhbi5kZy9wcjYxNjY5LmY5MAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSB0ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcv cHI2MTY2OS5mOTAJKHJldmlzaW9uIDApCisrKyB0ZXN0c3VpdGUvZ2ZvcnRy YW4uZGcvcHI2MTY2OS5mOTAJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4 IEBACishIHsgZGctZG8gY29tcGlsZSB9CisgICAgICB3cml0ZSAoKiwiKGEp IikgY2hhcigxMikKKyAgICAgIENIQVJBQ1RFUio4MCBBIC8iQSIvICAgICAg ISB7IGRnLWVycm9yICJVbmV4cGVjdGVkIGRhdGEgZGVjbGFyYXRpb24gc3Rh dGVtZW50IiB9CisgICAgICBSRUFMKjQgQiAgICAgICAgICAgICAgICAgICEg eyBkZy1lcnJvciAiVW5leHBlY3RlZCBkYXRhIGRlY2xhcmF0aW9uIHN0YXRl bWVudCIgfQorICAgICAgd3JpdGUgKCosIihhKSIpIGNoYXIoMTIpCisgICAg ICBEQVRBIEIgLyAwLjAyIC8KKyAgICAgIEVORAorCg== --20cf3079bd4e2a59da05014d1d8d--