wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 11:41:15 +02:00
Code Activity

* Handle out of memory condition.

Browse source
This commit is contained in:
Eelco Dolstra 2010-10-28 12:29:40 +00:00
parent 8a788e38ac
commit e11e6fb1c6
5 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/eval.cc
View file

@ -259,9 +259,8 @@ void mkString(Value & v, const string & s, const PathSet & context)
mkString(v, s.c_str());
if (!context.empty()) {
unsigned int n = 0;
v.string.context = (const char * *)
GC_MALLOC((context.size() + 1) * sizeof(char *));
foreach (PathSet::const_iterator, i, context)
v.string.context = NEW const char *[context.size() + 1];
foreach (PathSet::const_iterator, i, context)
v.string.context[n++] = GC_STRDUP(i->c_str());
v.string.context[n] = 0;
}
@ -305,7 +304,7 @@ Value * EvalState::lookupVar(Env * env, const VarRef & var)
Value * EvalState::allocValue()
{
nrValues++;
return (Value *) GC_MALLOC(sizeof(Value));
return NEW Value;
}
@ -314,6 +313,7 @@ Env & EvalState::allocEnv(unsigned int size)
nrEnvs++;
nrValuesInEnvs += size;
Env * env = (Env *) GC_MALLOC(sizeof(Env) + size * sizeof(Value *));
if (!env) throw std::bad_alloc();
/* Clear the values because maybeThunk() expects this. */
for (unsigned i = 0; i < size; ++i)
@ -335,7 +335,7 @@ void EvalState::mkList(Value & v, unsigned int length)
{
v.type = tList;
v.list.length = length;
v.list.elems = (Value * *) GC_MALLOC(length * sizeof(Value *));
v.list.elems = NEW Value *[length];
nrListElems += length;
}