Browse Source

sparse/hybrid stochastic: fix delete call in error case

Consistently use delete[] for sum arrays (only hit in error case).
master
Joachim Klein 8 years ago
committed by Dave Parker
parent
commit
90d8529f2d
  1. 2
      prism/src/hybrid/PH_StochBoundedUntil.cc
  2. 2
      prism/src/hybrid/PH_StochCumulReward.cc
  3. 2
      prism/src/hybrid/PH_StochTransient.cc
  4. 4
      prism/src/sparse/PS_StochBoundedUntil.cc
  5. 2
      prism/src/sparse/PS_StochCumulReward.cc
  6. 2
      prism/src/sparse/PS_StochTransient.cc

2
prism/src/hybrid/PH_StochBoundedUntil.cc

@ -313,7 +313,7 @@ jlong __jlongpointer mu // probs for multiplying
sum = 0;
} catch (const char *err) {
PH_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

2
prism/src/hybrid/PH_StochCumulReward.cc

@ -326,7 +326,7 @@ jdouble time // time bound
sum = 0;
} catch (const char *err) {
PH_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

2
prism/src/hybrid/PH_StochTransient.cc

@ -294,7 +294,7 @@ jdouble time // time bound
sum = 0;
} catch (const char *err) {
PH_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

4
prism/src/sparse/PS_StochBoundedUntil.cc

@ -335,11 +335,11 @@ jlong __jlongpointer mu // probs for multiplying
// catch exceptions: register error, free memory
} catch (std::bad_alloc e) {
PS_SetErrorMessage("Out of memory");
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
} catch (const char *err) {
PS_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

2
prism/src/sparse/PS_StochCumulReward.cc

@ -351,7 +351,7 @@ jdouble time // time bound
sum = 0;
} catch (const char *err) {
PS_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

2
prism/src/sparse/PS_StochTransient.cc

@ -318,7 +318,7 @@ jdouble time // time bound
sum = 0;
} catch (const char *err) {
PS_SetErrorMessage("%s", err);
if (sum) delete sum;
if (sum) delete[] sum;
sum = 0;
}

Loading…
Cancel
Save