Skip to content

Avoid more cases of possibly segaulting current.type #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from Nov 5, 2018
Merged

Avoid more cases of possibly segaulting current.type #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/dparse/parser.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ class Parser
{
trace("Found register");
mixin (nullCheck!`(node.register = parseRegister())`);
if (current.type == tok!":")
if (currentIs(tok!":"))
{
advance();
mixin(parseNodeQ!(`node.segmentOverrideSuffix`, `AsmExp`));
Expand Down Expand Up @@ -1296,6 +1296,8 @@ class Parser
{
mixin(traceEnterAndExit!(__FUNCTION__));
auto node = allocator.make!BaseClass;
if (!moreTokens)
return null;
if (current.type.isProtection())
{
warn("Use of base class protection is deprecated.");
Expand Down Expand Up @@ -1443,6 +1445,8 @@ class Parser
{
mixin(traceEnterAndExit!(__FUNCTION__));
auto node = allocator.make!CastQualifier;
if (!moreTokens)
return null;
switch (current.type)
{
case tok!"inout":
Expand Down Expand Up @@ -1612,6 +1616,8 @@ class Parser
{
mixin(traceEnterAndExit!(__FUNCTION__));
auto node = allocator.make!CompileCondition;
if (!moreTokens)
return null;
switch (current.type)
{
case tok!"version":
Expand Down Expand Up @@ -4155,6 +4161,8 @@ class Parser
MemberFunctionAttribute parseMemberFunctionAttribute()
{
mixin(traceEnterAndExit!(__FUNCTION__));
if (!moreTokens)
return null;
auto node = allocator.make!MemberFunctionAttribute;
switch (current.type)
{
Expand Down Expand Up @@ -4430,11 +4438,11 @@ class Parser
advance();
ExpressionNode e;
// issue 170: try to find a valid ExpressionStatement / EmptyStatement
if (current.type != tok!";" && current.type != tok!"}")
if (!currentIsOneOf(tok!";", tok!"}"))
{
e = parseAssignExpression();
}
if ((current.type == tok!";" && e) || (!e && current.type == tok!";"))
if ((currentIs(tok!";") && e) || (!e && currentIs(tok!";")))
{
goToBookmark(g);
mixin(parseNodeQ!(`node.assignExpression`, `AssignExpression`));
Expand Down Expand Up @@ -4659,6 +4667,8 @@ class Parser
ParameterAttribute parseParameterAttribute(bool validate = false)
{
mixin(traceEnterAndExit!(__FUNCTION__));
if (!moreTokens)
return null;
auto node = allocator.make!ParameterAttribute;
switch (current.type)
{
Expand Down Expand Up @@ -5490,6 +5500,8 @@ class Parser
*/
StorageClass parseStorageClass()
{
if (!moreTokens)
return null;
auto node = allocator.make!StorageClass;
switch (current.type)
{
Expand Down Expand Up @@ -5955,6 +5967,8 @@ class Parser
TemplateParameter parseTemplateParameter()
{
mixin(traceEnterAndExit!(__FUNCTION__));
if (!moreTokens)
return null;
auto node = allocator.make!TemplateParameter;
switch (current.type)
{
Expand Down