Compare commits

..

5 Commits

Author SHA1 Message Date
Torsten Dreyer
12d0d4140e Version 3.1.0 2014-01-17 21:59:58 +01:00
Torsten Dreyer
d6c8008978 No double-zero for the version number :-/ 2014-01-17 21:49:13 +01:00
James Turner
488ca0fcc5 Remove a noisy log message from the Terrasync code. 2014-01-17 17:46:46 +00:00
James Turner
dfd15cadab Bug-fix - short-circuit path validation.
When an SGPath is empty, don't bother stat()-ing. This avoids
an uninitialized-memory read inside the C-runtime on Windows.
2014-01-17 17:26:29 +00:00
James Turner
1613257bdc Ensure type tag of contextId binding is set.
(Otherwise defaults to DOUBLE).
2014-01-17 16:27:54 +00:00
4 changed files with 13 additions and 7 deletions

View File

@@ -319,7 +319,6 @@ void SVNDirectory::mergeUpdateReportDetails(unsigned int depth,
Dir d(localPath);
if (depth >= MAX_UPDATE_REPORT_DEPTH) {
SG_LOG(SG_IO, SG_INFO, localPath << "exceeded MAX_UPDATE_REPORT_DEPTH, cleaning");
d.removeChildren();
return;
}

View File

@@ -312,13 +312,20 @@ void SGPath::validate() const
return;
}
if (path.empty()) {
_exists = false;
return;
}
#ifdef _WIN32
struct _stat buf ;
bool remove_trailing = false;
if ( path.length() > 1 && path[path.length()-1] == '/' )
remove_trailing=true;
if (_stat (path.substr(0,remove_trailing?path.length()-1:path.length()).c_str(), &buf ) < 0) {
string statPath(path);
if ((path.length() > 1) && (path.back() == '/')) {
statPath.pop_back();
}
if (_stat(statPath.c_str(), &buf ) < 0) {
_exists = false;
} else {
_exists = true;

View File

@@ -118,7 +118,7 @@ void Technique::validateInContext(GraphicsContext* gc)
Status oldVal = contextInfo.valid();
Status newVal = INVALID;
expression::FixedLengthBinding<1> binding;
binding.getBindings()[_contextIdLocation].val.intVal = contextId;
binding.getBindings()[_contextIdLocation] = expression::Value((int) contextId);
if (_validExpression->getValue(&binding))
newVal = VALID;
contextInfo.valid.compareAndSwap(oldVal, newVal);

View File

@@ -1 +1 @@
3.00.0
3.1.0