← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/guardedalloc/cpp/mallocn.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-05-12 20:02:22 UTC
  • mfrom: (14.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20120512200222-lznjs2cxzaq96wua
Tags: 2.63a-1
* New upstream bugfix release
  + debian/patches/: re-worked since source code changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/guardedalloc/cpp/mallocn.cpp
41
41
 
42
42
void operator delete (void *p)
43
43
{
44
 
        MEM_freeN(p);
 
44
        /* delete NULL is valid in c++ */
 
45
        if(p)
 
46
                MEM_freeN(p);
45
47
}