[Firebird-checkins] SF.net SVN: firebird:[59293] firebird/trunk

[<ro...@us...>]

Revision: 59293
          http://sourceforge.net/p/firebird/code/59293
Author:   robocop
Date:     2014-03-21 23:03:56 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt
    firebird/trunk/src/dsql/ExprNodes.cpp
    firebird/trunk/src/jrd/opt.cpp

Modified: firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt	2014-03-21 23:03:56 UTC (rev 59293)
@@ -91,7 +91,7 @@
 	   FUNCTION} triggers.
 
 Notes:
-	1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE does not fire DDL triggers.
+	1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE do not fire DDL triggers.
 
 Utilities support:
 	DDL triggers is a type of database triggers, so the parameters -nodbtriggers (GBAK and ISQL)

Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/src/dsql/ExprNodes.cpp	2014-03-21 23:03:56 UTC (rev 59293)
@@ -1508,7 +1508,7 @@
 
 	const SLONG l1 = MOV_get_long(desc, node->nodScale);
 	const SINT64 l2 = MOV_get_long(&value->vlu_desc, node->nodScale);
-	SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
+	const SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
 
 	if (rc < MIN_SLONG || rc > MAX_SLONG)
 		ERR_post(Arg::Gds(isc_exception_integer_overflow));
@@ -10395,7 +10395,8 @@
 		csb->csb_blr_reader.setPos(savePos);
 		return SysFuncCallNode::parse(tdbb, pool, csb, blr_sys_function);
 	}
-	else if (blrOp == blr_subfunc)
+
+	if (blrOp == blr_subfunc)
 	{
 		DeclareSubFuncNode* declareNode;
 		if (csb->subFunctions.get(name.identifier, declareNode))

Modified: firebird/trunk/src/jrd/opt.cpp
===================================================================
--- firebird/trunk/src/jrd/opt.cpp	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/src/jrd/opt.cpp	2014-03-21 23:03:56 UTC (rev 59293)
@@ -689,7 +689,7 @@
 			nodeBase = opt->opt_base_conjuncts;
 		}
 
-		fb_assert(nodeBase >= 0 && j >= 0);
+		fb_assert(nodeBase >= 0 && j >= 0 && nodeBase + j < MAX_CONJUNCTS);
 		opt->opt_conjuncts[nodeBase + j].opt_conjunct_node = node;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.