luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for GitHub issue 235: segfault when calling vpi_handle_by_name(). 

When vpi_handle_by_name() iterates over the VPI objects in a scope, handle
the case that vpi_get_str() returns a null value. This currently occurs if
the scope contains an enum type definition, as vpi_get_str() is not
implemented for __vpiEnumTypespec.

(cherry picked from commit 51a13e883a)
This commit is contained in:
Martin Whitaker 2019-03-23 17:21:40 +00:00
parent d46e7ace70
commit 7399f3744b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vvp/vpi_priv.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008-2018 Stephen Williams (steve@icarus.com) * Copyright (c) 2008-2019 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -1293,7 +1293,7 @@ static vpiHandle find_name(const char *name, vpiHandle handle)
* to skip ports here so the correct handle can be located. */ * to skip ports here so the correct handle can be located. */
if (vpi_get(vpiType, ref->intern[i]) == vpiPort) continue; if (vpi_get(vpiType, ref->intern[i]) == vpiPort) continue;
char *nm = vpi_get_str(vpiName, ref->intern[i]); char *nm = vpi_get_str(vpiName, ref->intern[i]);
if (!strcmp(name, nm)) { if (nm && !strcmp(name, nm)) {
rtn = ref->intern[i]; rtn = ref->intern[i];
break; break;
} else if (vpi_get(vpiType, ref->intern[i]) == vpiMemory || } else if (vpi_get(vpiType, ref->intern[i]) == vpiMemory ||
@ -1303,7 +1303,7 @@ static vpiHandle find_name(const char *name, vpiHandle handle)
word_i = vpi_iterate(vpiMemoryWord, ref->intern[i]); word_i = vpi_iterate(vpiMemoryWord, ref->intern[i]);
while (word_i && (word_h = vpi_scan(word_i))) { while (word_i && (word_h = vpi_scan(word_i))) {
nm = vpi_get_str(vpiName, word_h); nm = vpi_get_str(vpiName, word_h);
if (!strcmp(name, nm)) { if (nm && !strcmp(name, nm)) {
rtn = word_h; rtn = word_h;
vpi_free_object(word_i); vpi_free_object(word_i);
break; break;