Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
8f49a267
Commit
8f49a267
authored
7 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-7691 Crash report is not generated/sent if appdata path contains unicode symbols
parent
9831f7fb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llcrashlogger/llcrashlogger.cpp
+6
-6
6 additions, 6 deletions
indra/llcrashlogger/llcrashlogger.cpp
with
6 additions
and
6 deletions
indra/llcrashlogger/llcrashlogger.cpp
+
6
−
6
View file @
8f49a267
...
@@ -155,9 +155,9 @@ std::string getStartupStateFromLog(std::string& sllog)
...
@@ -155,9 +155,9 @@ std::string getStartupStateFromLog(std::string& sllog)
bool
LLCrashLogger
::
readFromXML
(
LLSD
&
dest
,
const
std
::
string
&
filename
)
bool
LLCrashLogger
::
readFromXML
(
LLSD
&
dest
,
const
std
::
string
&
filename
)
{
{
std
::
string
db_file_name
=
gDirUtilp
->
getExpandedFilename
(
LL_PATH_DUMP
,
filename
);
std
::
string
db_file_name
=
gDirUtilp
->
getExpandedFilename
(
LL_PATH_DUMP
,
filename
);
std
::
ifstream
log_file
(
db_file_name
.
c_str
());
ll
ifstream
log_file
(
db_file_name
.
c_str
());
// Look for it in the given file
// Look for it in the given file
if
(
log_file
.
is_open
())
if
(
log_file
.
is_open
())
{
{
...
@@ -186,7 +186,7 @@ bool LLCrashLogger::readMinidump(std::string minidump_path)
...
@@ -186,7 +186,7 @@ bool LLCrashLogger::readMinidump(std::string minidump_path)
{
{
size_t
length
=
0
;
size_t
length
=
0
;
std
::
ifstream
minidump_stream
(
minidump_path
.
c_str
(),
std
::
ios_base
::
in
|
std
::
ios_base
::
binary
);
ll
ifstream
minidump_stream
(
minidump_path
.
c_str
(),
std
::
ios_base
::
in
|
std
::
ios_base
::
binary
);
if
(
minidump_stream
.
is_open
())
if
(
minidump_stream
.
is_open
())
{
{
minidump_stream
.
seekg
(
0
,
std
::
ios
::
end
);
minidump_stream
.
seekg
(
0
,
std
::
ios
::
end
);
...
@@ -287,7 +287,7 @@ void LLCrashLogger::gatherFiles()
...
@@ -287,7 +287,7 @@ void LLCrashLogger::gatherFiles()
if
(
!
file
.
empty
())
if
(
!
file
.
empty
())
{
{
LL_DEBUGS
(
"CRASHREPORT"
)
<<
"trying to read "
<<
itr
->
first
<<
": "
<<
file
<<
LL_ENDL
;
LL_DEBUGS
(
"CRASHREPORT"
)
<<
"trying to read "
<<
itr
->
first
<<
": "
<<
file
<<
LL_ENDL
;
std
::
ifstream
f
(
file
.
c_str
());
ll
ifstream
f
(
file
.
c_str
());
if
(
f
.
is_open
())
if
(
f
.
is_open
())
{
{
std
::
stringstream
s
;
std
::
stringstream
s
;
...
@@ -342,7 +342,7 @@ void LLCrashLogger::gatherFiles()
...
@@ -342,7 +342,7 @@ void LLCrashLogger::gatherFiles()
if
(
(
iter
->
length
()
>
30
)
&&
(
iter
->
rfind
(
".dmp"
)
==
(
iter
->
length
()
-
4
)
)
)
if
(
(
iter
->
length
()
>
30
)
&&
(
iter
->
rfind
(
".dmp"
)
==
(
iter
->
length
()
-
4
)
)
)
{
{
std
::
string
fullname
=
pathname
+
*
iter
;
std
::
string
fullname
=
pathname
+
*
iter
;
std
::
ifstream
fdat
(
fullname
.
c_str
(),
std
::
ifstream
::
binary
);
ll
ifstream
fdat
(
fullname
.
c_str
(),
std
::
ifstream
::
binary
);
if
(
fdat
)
if
(
fdat
)
{
{
char
buf
[
5
];
char
buf
[
5
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment