authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-12-30 12:17:52+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-30 19:17:19-05:00
logcbfd66f68a5a390abcf99e8cc6923d056ee1e4fa
tree7459e16f28ca5c7647aba00207dec2cad662b856
parenta05150e92d5925f14591d96220de3bb341be1154

Don't crash when parsing invalid files

1 files changed, 15 insertions(+), 34 deletions(-)

src/zig_clang.cpp+15-34
...@@ -13,6 +13,7 @@...@@ -13,6 +13,7 @@
13 * 3. Prevent C++ from infecting the rest of the project.13 * 3. Prevent C++ from infecting the rest of the project.
14 */14 */
15#include "zig_clang.h"15#include "zig_clang.h"
16#include "list.hpp"
1617
17#if __GNUC__ >= 818#if __GNUC__ >= 8
18#pragma GCC diagnostic push19#pragma GCC diagnostic push
...@@ -1947,35 +1948,28 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char...@@ -1947,35 +1948,28 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
1947 bool allow_pch_with_compiler_errors = false;1948 bool allow_pch_with_compiler_errors = false;
1948 bool single_file_parse = false;1949 bool single_file_parse = false;
1949 bool for_serialization = false;1950 bool for_serialization = false;
1950 std::unique_ptr<clang::ASTUnit> *err_unit = new std::unique_ptr<clang::ASTUnit>();1951 std::unique_ptr<clang::ASTUnit> err_unit;
1951 clang::ASTUnit *ast_unit = clang::ASTUnit::LoadFromCommandLine(1952 clang::ASTUnit *ast_unit = clang::ASTUnit::LoadFromCommandLine(
1952 args_begin, args_end,1953 args_begin, args_end,
1953 pch_container_ops, diags, resources_path,1954 pch_container_ops, diags, resources_path,
1954 only_local_decls, clang::CaptureDiagsKind::All, clang::None, true, 0, clang::TU_Complete,1955 only_local_decls, clang::CaptureDiagsKind::All, clang::None, true, 0, clang::TU_Complete,
1955 false, false, allow_pch_with_compiler_errors, clang::SkipFunctionBodiesScope::None,1956 false, false, allow_pch_with_compiler_errors, clang::SkipFunctionBodiesScope::None,
1956 single_file_parse, user_files_are_volatile, for_serialization, clang::None, err_unit,1957 single_file_parse, user_files_are_volatile, for_serialization, clang::None, &err_unit,
1957 nullptr);1958 nullptr);
19581959
1960 *errors_len = 0;
1961
1959 // Early failures in LoadFromCommandLine may return with ErrUnit unset.1962 // Early failures in LoadFromCommandLine may return with ErrUnit unset.
1960 if (!ast_unit && !err_unit) {1963 if (!ast_unit && !err_unit) {
1961 return nullptr;1964 return nullptr;
1962 }1965 }
19631966
1964 if (diags->getClient()->getNumErrors() > 0) {1967 if (diags->hasErrorOccurred()) {
1965 if (ast_unit) {1968 clang::ASTUnit *unit = ast_unit ? ast_unit : err_unit.get();
1966 *err_unit = std::unique_ptr<clang::ASTUnit>(ast_unit);1969 ZigList<Stage2ErrorMsg> errors = {};
1967 }
19681970
1969 size_t cap = 4;1971 for (clang::ASTUnit::stored_diag_iterator it = unit->stored_diag_begin(),
1970 *errors_len = 0;1972 it_end = unit->stored_diag_end(); it != it_end; ++it)
1971 *errors_ptr = reinterpret_cast<Stage2ErrorMsg*>(malloc(cap * sizeof(Stage2ErrorMsg)));
1972 if (*errors_ptr == nullptr) {
1973 return nullptr;
1974 }
1975
1976 for (clang::ASTUnit::stored_diag_iterator it = (*err_unit)->stored_diag_begin(),
1977 it_end = (*err_unit)->stored_diag_end();
1978 it != it_end; ++it)
1979 {1973 {
1980 switch (it->getLevel()) {1974 switch (it->getLevel()) {
1981 case clang::DiagnosticsEngine::Ignored:1975 case clang::DiagnosticsEngine::Ignored:
...@@ -1987,21 +1981,10 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char...@@ -1987,21 +1981,10 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
1987 case clang::DiagnosticsEngine::Fatal:1981 case clang::DiagnosticsEngine::Fatal:
1988 break;1982 break;
1989 }1983 }
1984
1990 llvm::StringRef msg_str_ref = it->getMessage();1985 llvm::StringRef msg_str_ref = it->getMessage();
1991 if (*errors_len >= cap) {1986
1992 cap *= 2;1987 Stage2ErrorMsg *msg = errors.add_one();
1993 Stage2ErrorMsg *new_errors = reinterpret_cast<Stage2ErrorMsg *>(
1994 realloc(*errors_ptr, cap * sizeof(Stage2ErrorMsg)));
1995 if (new_errors == nullptr) {
1996 free(*errors_ptr);
1997 *errors_ptr = nullptr;
1998 *errors_len = 0;
1999 return nullptr;
2000 }
2001 *errors_ptr = new_errors;
2002 }
2003 Stage2ErrorMsg *msg = *errors_ptr + *errors_len;
2004 *errors_len += 1;
2005 msg->msg_ptr = (const char *)msg_str_ref.bytes_begin();1988 msg->msg_ptr = (const char *)msg_str_ref.bytes_begin();
2006 msg->msg_len = msg_str_ref.size();1989 msg->msg_len = msg_str_ref.size();
20071990
...@@ -2027,10 +2010,8 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char...@@ -2027,10 +2010,8 @@ ZigClangASTUnit *ZigClangLoadFromCommandLine(const char **args_begin, const char
2027 }2010 }
2028 }2011 }
20292012
2030 if (*errors_len == 0) {2013 *errors_ptr = errors.items;
2031 free(*errors_ptr);2014 *errors_len = errors.length;
2032 *errors_ptr = nullptr;
2033 }
20342015
2035 return nullptr;2016 return nullptr;
2036 }2017 }