Ecere Software
/
sdk
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e9aa54b
)
ide/Project: Fixed crash in build log parsing
author
Jerome St-Louis
<jerome@ecere.com>
Mon, 27 May 2013 17:01:31 +0000
(13:01 -0400)
committer
Jerome St-Louis
<jerome@ecere.com>
Mon, 27 May 2013 17:01:31 +0000
(13:01 -0400)
ide/src/project/Project.ec
patch
|
blob
|
history
diff --git
a/ide/src/project/Project.ec
b/ide/src/project/Project.ec
index
7a1cbc1
..
64dc7e8
100644
(file)
--- a/
ide/src/project/Project.ec
+++ b/
ide/src/project/Project.ec
@@
-1641,7
+1641,8
@@
private:
{
if(linking || compiling || precompiling)
{
{
if(linking || compiling || precompiling)
{
- char * colon = strstr(line, ":"); //, * bracket;
+ char * start = inFileIncludedFrom ? inFileIncludedFrom + strlen(stringInFileIncludedFrom) : from ? from + strlen(stringFrom) : line;
+ char * colon = strstr(start, ":"); //, * bracket;
if(colon && (colon[1] == '/' || colon[1] == '\\'))
colon = strstr(colon + 1, ":");
if(colon)
if(colon && (colon[1] == '/' || colon[1] == '\\'))
colon = strstr(colon + 1, ":");
if(colon)
@@
-1650,7
+1651,6
@@
private:
char moduleName[MAX_LOCATION], temp[MAX_LOCATION];
char * pointer;
char * error;
char moduleName[MAX_LOCATION], temp[MAX_LOCATION];
char * pointer;
char * error;
- char * start = inFileIncludedFrom ? inFileIncludedFrom + strlen(stringInFileIncludedFrom) : from ? from + strlen(stringFrom) : line;
int len = (int)(colon - start);
char ext[MAX_EXTENSION];
len = Min(len, MAX_LOCATION-1);
int len = (int)(colon - start);
char ext[MAX_EXTENSION];
len = Min(len, MAX_LOCATION-1);