fixed crash

jsteemann · jsteemann · commit fb723c3c2435 · 2016-05-06T13:59:24.000+02:00
diff --git a/arangod/Aql/CalculationBlock.cpp b/arangod/Aql/CalculationBlock.cpp
@@ -90,15 +90,10 @@ void CalculationBlock::fillBlockWithReference(AqlItemBlock* result) {
     // care of correct freeing:
     auto a = result->getValueReference(i, _inRegs[0]);
 
-    try {
-      TRI_IF_FAILURE("CalculationBlock::fillBlockWithReference") {
-        THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
-      }
-      result->setValue(i, _outReg, a);
-    } catch (...) {
-      a.destroy();
-      throw;
+    TRI_IF_FAILURE("CalculationBlock::fillBlockWithReference") {
+      THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);
     }
+    result->setValue(i, _outReg, a);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,10 @@ void CalculationBlock::fillBlockWithReference(AqlItemBlock* result) {`
`90`	`90`	`// care of correct freeing:`
`91`	`91`	`auto a = result->getValueReference(i, _inRegs[0]);`
`92`	`92`
`93`		`- try {`
`94`		`- TRI_IF_FAILURE("CalculationBlock::fillBlockWithReference") {`
`95`		`- THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);`
`96`		`- }`
`97`		`- result->setValue(i, _outReg, a);`
`98`		`- } catch (...) {`
`99`		`- a.destroy();`
`100`		`- throw;`
	`93`	`+ TRI_IF_FAILURE("CalculationBlock::fillBlockWithReference") {`
	`94`	`+ THROW_ARANGO_EXCEPTION(TRI_ERROR_DEBUG);`
`101`	`95`	`}`
	`96`	`+ result->setValue(i, _outReg, a);`
`102`	`97`	`}`
`103`	`98`	`}`
`104`	`99`