Skip to content

R
riscv-gcc-1
Commit ea99f631 by Ian Lance Taylor
Options

re PR bootstrap/56198 (Go profiledbootstrap error) 

	PR bootstrap/56198
compiler: Always initialize *nested_off in interpret_header.

From-SVN: r195747
parent 40b251cc
Showing with 2 additions and 3 deletions
gcc/go/gofrontend/import-archive.cc
...@@ -277,6 +277,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off, ...@@ -277,6 +277,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false; return false;
} }
*nested_off = 0;
if (hdr->ar_name[0] != '/') if (hdr->ar_name[0] != '/')
{ {
const char* name_end = strchr(hdr->ar_name, '/'); const char* name_end = strchr(hdr->ar_name, '/');
...@@ -288,7 +289,6 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off, ...@@ -288,7 +289,6 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false; return false;
} }
pname->assign(hdr->ar_name, name_end - hdr->ar_name); pname->assign(hdr->ar_name, name_end - hdr->ar_name);
*nested_off = 0;
} }
else if (hdr->ar_name[1] == ' ') else if (hdr->ar_name[1] == ' ')
{ {
...@@ -327,8 +327,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off, ...@@ -327,8 +327,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false; return false;
} }
pname->assign(name, name_end - 1 - name); pname->assign(name, name_end - 1 - name);
if (nested_off != NULL) *nested_off = y;
*nested_off = y;
} }
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment