[PATCH] D65897: [BitcodeReader] Check if we can create a null constant for type.

[Florian Hahn via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL369557: [BitcodeReader] Check if we can create a null constant for type. (authored by fhahn, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D65897?vs=213970&id=216438#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65897/new/

https://reviews.llvm.org/D65897

Files:
  llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
  llvm/trunk/test/Bitcode/invalid-type-for-null-constant.ll
  llvm/trunk/test/Bitcode/invalid-type-for-null-constant.ll.bc


Index: llvm/trunk/test/Bitcode/invalid-type-for-null-constant.ll
===================================================================
--- llvm/trunk/test/Bitcode/invalid-type-for-null-constant.ll
+++ llvm/trunk/test/Bitcode/invalid-type-for-null-constant.ll
@@ -0,0 +1,6 @@
+; Bitcode with a CST_CODE_NULL with void type.
+
+; RUN: not llvm-dis %s.bc -o - 2>&1 | FileCheck %s
+
+; CHECK: error: Invalid type for a constant null value
+
Index: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
===================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -2377,6 +2377,8 @@
       CurTy = flattenPointerTypes(CurFullTy);
       continue;  // Skip the ValueList manipulation.
     case bitc::CST_CODE_NULL:      // NULL
+      if (CurTy->isVoidTy() || CurTy->isFunctionTy() || CurTy->isLabelTy())
+        return error("Invalid type for a constant null value");
       V = Constant::getNullValue(CurTy);
       break;
     case bitc::CST_CODE_INTEGER:   // INTEGER: [intval]


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65897.216438.patch
Type: text/x-patch
Size: 1084 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190821/9bec78b9/attachment.bin>