Skip to content

Commit

Permalink
compiler: Avoid unsafe memcmp for nointerface comments.
Browse files Browse the repository at this point in the history
    
    Fixes golang/go#11577.
    
    Reviewed-on: https://go-review.googlesource.com/14182


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227699 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
ian committed Sep 11, 2015
1 parent 01e5628 commit 2564602
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gcc/go/gofrontend/MERGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
352617bfe0a880febf5d2a87e89ea439c742ba18
aea4360ca9c37f8e929f177ae7e42593ee62aa79

The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
4 changes: 3 additions & 1 deletion gcc/go/gofrontend/lex.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,9 @@ Lex::skip_cpp_comment()
// For field tracking analysis: a //go:nointerface comment means
// that the next interface method should not be stored in the type
// descriptor. This permits it to be discarded if it is not needed.
if (this->lineoff_ == 2 && memcmp(p, "go:nointerface", 14) == 0)
if (this->lineoff_ == 2
&& pend - p > 14
&& memcmp(p, "go:nointerface", 14) == 0)
this->saw_nointerface_ = true;

while (p < pend)
Expand Down

0 comments on commit 2564602

Please sign in to comment.