fiddlerwoaroof/crawl - Change NUEPUFFFIEILCZCNNNANHPKCDKHOLMJE5RCNTK475SCEBTBHBUUAC

The copy operator for CrawlStoreValue was copying the value of the

val.ptr pointer, rather than copying the object that the pointer referenced; this could potentially lead to freed memory being referenced or to memory being freed twice. This will hopefully fix some CrawlStore related assertions caused by randarts.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3015 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on December 7, 2007

NUEPUFFFIEILCZCNNNANHPKCDKHOLMJE5RCNTK475SCEBTBHBUUAC

Dependencies

[2] K2GMFKXUWN5R3KCW6OYVXHN47MIQZKEEIOSAU6LFFKBNKF6JBVWAC

In channels

main

Change contents

Replacement in crawl-ref/source/store.cc at line 262 [2.12569]

B:BD[2.17615] → [2.17615:17661]

// Only needed to do some assertion checking.

[2.17615]

[2.17661]

#define COPY_PTR(ptr_type) \
    { \
        ptr_type *ptr = static_cast<ptr_type*>(val.ptr); \
        if (ptr != NULL) \
            delete ptr; \
        ptr = static_cast<ptr_type*>(other.val.ptr); \
        val.ptr = (void*) new ptr_type (*ptr);  \
    }

Deletion in crawl-ref/source/store.cc at line 278 [2.12569]
B:BD[2.17992] → [2.17992:17993]

Replacement in crawl-ref/source/store.cc at line 286 [2.12569]

B:BD[2.18184] → [2.18184:18207]

    val   = other.val;

[2.18184]

[2.18207]


    switch(type)
    {
    case SV_NONE:
        break;
    case SV_BOOL:
    case SV_BYTE:
    case SV_SHORT:
    case SV_LONG:
    case SV_FLOAT:
        val = other.val;
        break;
    case SV_STR:
        COPY_PTR(std::string);
        break;

Insertion in crawl-ref/source/store.cc at line 304 [2.12569]

[2.18208]

    case SV_COORD:
        COPY_PTR(coord_def);
        break;
    case SV_ITEM:
        COPY_PTR(item_def);
        break;
    case SV_HASH:
        COPY_PTR(CrawlHashTable);
        break;
    case SV_VEC:
        COPY_PTR(CrawlVector);
        break;
    case NUM_STORE_VAL_TYPES:
        DEBUGSTR("CrawlStoreValue has type NUM_STORE_VAL_TYPES");
        break;
    }