fiddlerwoaroof/crawl - Change TPO6FNMPNUSWH4NCKO3VLYNAADEPSAXLUITCCACLZZSY53PKA62QC

For functions that return char*'s, don't return a c_str() of an

std::string, since as soon as the function returns, the std::string goes out of scope, and the c_str() becomes a dangling pointer, which usually points to the same area as before, but occasionally points to garbage.
Instead, make them return std::string's, and call c_str() on the return value outside the functions. Among other things, this should fix [1999515].

Note that I've only fixed direct c_str() returns for now. There might be some indirect ones that I missed.

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

Created by dolorous on June 25, 2008

TPO6FNMPNUSWH4NCKO3VLYNAADEPSAXLUITCCACLZZSY53PKA62QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 107 [14.3]

B:BD[13.1742] → [12.72:130]

static const char *_get_xom_speech(const std::string key)

[13.1742]

[15.86]

static std::string _get_xom_speech(const std::string key)

Replacement in crawl-ref/source/xom.cc at line 117 [14.3]

B:BD[16.8] → [17.77:178]

//    mprf(MSGCH_DIAGNOSTICS, "Xom speech result: %s", result.c_str());
    return (result.c_str());

[16.8]

[18.750]

    return (result);

Replacement in crawl-ref/source/xom.cc at line 193 [14.3]

B:BD[14.4515] → [15.351:409]

    god_speaks(GOD_XOM, _get_xom_speech("spell effect"));

[14.4515]

[19.65]

    god_speaks(GOD_XOM, _get_xom_speech("spell effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 266 [14.3]

∅:D[2.54] → [15.410:475]

∅:D[20.201] → [15.410:475]

B:BD[14.6599] → [15.410:475]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

[2.54]

[14.6634]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 280 [14.3]

B:BD[14.7215] → [15.476:541]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

[2.86]

[21.407]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 290 [14.3]

∅:D[20.240] → [15.542:607]

B:BD[14.7595] → [15.542:607]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift"));

[20.240]

[21.486]

            god_speaks(GOD_XOM, _get_xom_speech("cursed gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 302 [14.3]

∅:D[20.272] → [15.608:671]

B:BD[14.8122] → [15.608:671]

            god_speaks(GOD_XOM, _get_xom_speech("ring gift"));

[20.272]

[21.567]

            god_speaks(GOD_XOM, _get_xom_speech("ring gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 311 [14.3]
∅:D[22.293] → [15.672:737]
∅:D[20.394] → [15.672:737]
B:BD[14.8448] → [15.672:737]
```
            god_speaks(GOD_XOM, _get_xom_speech("weapon gift"));
```
[20.394]
[14.8495]
```
            god_speaks(GOD_XOM, _get_xom_speech("weapon gift").c_str());
```

Replacement in crawl-ref/source/xom.cc at line 337 [14.3]

B:BD[20.436] → [23.4:65]

        god_speaks(GOD_XOM, _get_xom_speech("armour gift"));

[20.436]

[21.812]

        god_speaks(GOD_XOM, _get_xom_speech("armour gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 346 [14.3]

B:BD[14.9443] → [15.804:862]

    god_speaks(GOD_XOM, _get_xom_speech("general gift"));

[14.9443]

[14.9481]

    god_speaks(GOD_XOM, _get_xom_speech("general gift").c_str());

Replacement in crawl-ref/source/xom.cc at line 450 [14.3]

B:BD[24.15] → [11.465:532]

            god_speaks(GOD_XOM, _get_xom_speech("potion effect"));

[24.15]

[25.8]

            god_speaks(GOD_XOM, _get_xom_speech("potion effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 508 [14.3]

B:BD[5.1013] → [5.1013:1092]

                god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons"));

[5.1013]

[5.1092]

                god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons").c_str());

Replacement in crawl-ref/source/xom.cc at line 510 [14.3]

B:BD[5.1131] → [5.1131:1211]

                god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons"));

[5.1131]

[5.1211]

                god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons").c_str());

Replacement in crawl-ref/source/xom.cc at line 512 [14.3]

B:BD[5.1228] → [5.1228:1302]

                god_speaks(GOD_XOM, _get_xom_speech("multiple summons"));

[5.1228]

[26.347]

                god_speaks(GOD_XOM, _get_xom_speech("multiple summons").c_str());

Replacement in crawl-ref/source/xom.cc at line 552 [14.3]

B:BD[6.70] → [6.70:137]

            god_speaks(GOD_XOM, _get_xom_speech("vitrification"));

[6.70]

[25.14]

            god_speaks(GOD_XOM, _get_xom_speech("vitrification").c_str());

Replacement in crawl-ref/source/xom.cc at line 589 [14.3]

B:BD[4.262] → [4.262:338]

                god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));

[4.262]

[4.338]

                god_speaks(GOD_XOM, _get_xom_speech("single holy summon").c_str());

Replacement in crawl-ref/source/xom.cc at line 591 [14.3]

B:BD[4.355] → [4.355:426]

                god_speaks(GOD_XOM, _get_xom_speech("single summon"));

[4.355]

[4.426]

                god_speaks(GOD_XOM, _get_xom_speech("single summon").c_str());

Replacement in crawl-ref/source/xom.cc at line 607 [14.3]

B:BD[10.195] → [10.195:275]

                god_speaks(GOD_XOM, _get_xom_speech("good monster polymorph"));

[10.195]

[27.320]

                god_speaks(GOD_XOM, _get_xom_speech("good monster polymorph").c_str());

Replacement in crawl-ref/source/xom.cc at line 635 [14.3]

B:BD[28.119] → [9.110:178]

            god_speaks(GOD_XOM, _get_xom_speech("good mutations"));

[28.119]

[29.2271]

            god_speaks(GOD_XOM, _get_xom_speech("good mutations").c_str());

Replacement in crawl-ref/source/xom.cc at line 680 [14.3]

B:BD[4.841] → [4.841:923]

                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));

[4.841]

[4.923]

                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon").c_str());

Replacement in crawl-ref/source/xom.cc at line 682 [14.3]

B:BD[4.940] → [4.940:1023]

                god_speaks(GOD_XOM, _get_xom_speech("single major demon summon"));

[4.940]

[4.1023]

                god_speaks(GOD_XOM, _get_xom_speech("single major demon summon").c_str());

Replacement in crawl-ref/source/xom.cc at line 734 [14.3]

B:BD[14.19833] → [15.1675:1748]

            god_speaks(GOD_XOM, _get_xom_speech("zero miscast effect"));

[14.19833]

[19.257]

            god_speaks(GOD_XOM, _get_xom_speech("zero miscast effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 742 [14.3]

B:BD[14.20470] → [15.1749:1823]

            god_speaks(GOD_XOM, _get_xom_speech("minor miscast effect"));

[14.20470]

[19.261]

            god_speaks(GOD_XOM, _get_xom_speech("minor miscast effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 751 [14.3]

B:BD[14.21091] → [15.1824:1888]

            god_speaks(GOD_XOM, _get_xom_speech("lose stats"));

[14.21091]

[19.325]

            god_speaks(GOD_XOM, _get_xom_speech("lose stats").c_str());

Replacement in crawl-ref/source/xom.cc at line 760 [14.3]

B:BD[14.21653] → [15.1889:1964]

            god_speaks(GOD_XOM, _get_xom_speech("medium miscast effect"));

[14.21653]

[19.329]

            god_speaks(GOD_XOM, _get_xom_speech("medium miscast effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 772 [14.3]

B:BD[28.258] → [9.731:805]

                god_speaks(GOD_XOM, _get_xom_speech("random mutations"));

[28.258]

[30.293]

                god_speaks(GOD_XOM, _get_xom_speech("random mutations").c_str());

Replacement in crawl-ref/source/xom.cc at line 799 [14.3]

B:BD[10.992] → [10.992:1075]

                    god_speaks(GOD_XOM, _get_xom_speech("bad monster polymorph"));

[10.992]

[27.532]

                    god_speaks(GOD_XOM, _get_xom_speech("bad monster polymorph").c_str());

Replacement in crawl-ref/source/xom.cc at line 818 [14.3]

B:BD[14.24021] → [7.4:77]

            const char *speech = _get_xom_speech("draining or torment");

[14.24021]

[19.397]

            const char *speech = _get_xom_speech("draining or torment").c_str();

Replacement in crawl-ref/source/xom.cc at line 849 [14.3]

B:BD[14.24951] → [8.4:73]

            const char *speech = _get_xom_speech("hostile monster");

[14.24951]

[31.38]

            const char *speech = _get_xom_speech("hostile monster").c_str();

Replacement in crawl-ref/source/xom.cc at line 888 [14.3]

B:BD[14.26093] → [15.2265:2339]

            god_speaks(GOD_XOM, _get_xom_speech("major miscast effect"));

[14.26093]

[32.28]

            god_speaks(GOD_XOM, _get_xom_speech("major miscast effect").c_str());

Replacement in crawl-ref/source/xom.cc at line 897 [14.3]

B:BD[14.26708] → [15.2342:2406]

            god_speaks(GOD_XOM, _get_xom_speech("banishment"));

[14.26708]

[19.469]

            god_speaks(GOD_XOM, _get_xom_speech("banishment").c_str());

Replacement in crawl-ref/source/stuff.cc at line 1060 [34.224557]

B:BD[33.1035] → [33.1035:1095]

static const char* _list_allowed_keys(char yes1, char yes2,

[33.1035]

[35.214]

static std::string _list_allowed_keys(char yes1, char yes2,

Replacement in crawl-ref/source/stuff.cc at line 1072 [34.224557]
∅:D[36.149] → [33.1410:1439]
B:BD[33.1410] → [33.1410:1439]
```
    return (result.c_str());
```
[36.149]
[33.1439]
```
    return (result);
```

Replacement in crawl-ref/source/stuff.cc at line 1086 [34.224557]

B:BD[37.11031] → [35.423:499]

                                                         safe, allow_all));

[37.11031]

[37.11097]

                                                         safe, allow_all).c_str());

Replacement in crawl-ref/source/religion.cc at line 4535 [34.804403]

B:BD[38.2754] → [38.2754:2814]

static const char* _get_beogh_speech(const std::string key)

[38.2754]

[38.2814]

static std::string _get_beogh_speech(const std::string key)

Replacement in crawl-ref/source/religion.cc at line 4540 [34.804403]
B:BD[38.2899] → [38.2899:2932]
```
        return (result.c_str());
```
[38.2899]
[38.2932]
```
        return (result);
```

Replacement in crawl-ref/source/religion.cc at line 4558 [34.804403]

B:BD[39.499] → [38.2966:3024]

            revenge = _get_beogh_speech("idol follower");

[39.499]

[39.808]

            revenge = _get_beogh_speech("idol follower").c_str();

Replacement in crawl-ref/source/religion.cc at line 4560 [34.804403]

B:BD[39.853] → [38.3025:3083]

            revenge = _get_beogh_speech("idol hill orc");

[39.853]

[39.1104]

            revenge = _get_beogh_speech("idol hill orc").c_str();

Replacement in crawl-ref/source/religion.cc at line 4562 [34.804403]

B:BD[39.1117] → [38.3084:3139]

            revenge = _get_beogh_speech("idol other");

[39.1117]

[40.1272]

            revenge = _get_beogh_speech("idol other").c_str();

Replacement in crawl-ref/source/output.cc at line 1008 [34.1088282]

B:BD[41.2922] → [41.2922:3001]

static const char* _get_monster_name(const monsters *mon, bool list_a = false)

[41.2922]

[41.3001]

static std::string _get_monster_name(const monsters *mon, bool list_a = false)

Replacement in crawl-ref/source/output.cc at line 1046 [34.1088282]
B:BD[41.3553] → [41.3553:3578]
```
    return desc.c_str();
```
[41.3552]
[41.3578]
```
    return (desc);
```

Replacement in crawl-ref/source/output.cc at line 1117 [34.1088282]

B:BD[41.5658] → [41.5658:5730]

                describe.push_back(_get_monster_name(mons[i-1], true));

[41.5658]

[41.5730]

                describe.push_back(_get_monster_name(mons[i-1], true).c_str());

Replacement in crawl-ref/source/output.cc at line 1121 [34.1088282]

B:BD[41.5825] → [41.5825:5904]

                                   + pluralise(_get_monster_name(mons[i-1])));

[41.5825]

[41.5904]

                                   + pluralise(_get_monster_name(mons[i-1]).c_str()));

Replacement in crawl-ref/source/output.cc at line 1131 [34.1088282]

B:BD[41.6099] → [41.6099:6166]

        describe.push_back(_get_monster_name(mons[size-1], true));

[41.6099]

[41.6166]

        describe.push_back(_get_monster_name(mons[size-1], true).c_str());

Replacement in crawl-ref/source/output.cc at line 1136 [34.1088282]

B:BD[41.6243] → [41.6243:6317]

                           + pluralise(_get_monster_name(mons[size-1])));

[41.6243]

[41.6317]

                           + pluralise(_get_monster_name(mons[size-1]).c_str()));

Replacement in crawl-ref/source/output.cc at line 1625 [34.1088282]

B:BD[42.3430] → [42.3430:3492]

            const char* colname = colour_to_str(item.colour);

[42.3430]

[42.3492]

            const char* colname = colour_to_str(item.colour).c_str();

Replacement in crawl-ref/source/output.cc at line 1806 [34.1088282]

B:BD[43.54955] → [43.54955:55018]

                     colour_to_str(god_colour(you.religion)));

[43.54955]

[43.55018]

                     colour_to_str(god_colour(you.religion)).c_str());

Replacement in crawl-ref/source/macro.h at line 77 [34.2456702]
B:BD[44.274846] → [44.274846:274885]
```
const char *get_userfunction(int key);
```
[44.274846]
[34.2457492]
```
std::string get_userfunction(int key);
```
Replacement in crawl-ref/source/macro.cc at line 104 [34.2457534]
B:BD[44.275881] → [44.275881:275919]
```
const char *get_userfunction(int key)
```
[44.275881]
[44.275919]
```
std::string get_userfunction(int key)
```

Replacement in crawl-ref/source/macro.cc at line 107 [34.2457534]

B:BD[44.275958] → [44.275958:276021]

    return (index == -1? NULL : userfunctions[index].c_str());

[44.275958]

[44.276021]

    return (index == -1 ? NULL : userfunctions[index]);

Replacement in crawl-ref/source/macro.cc at line 110 [34.2457534]
B:BD[44.276024] → [44.276024:276079]
```
static const char *get_userfunction(const keyseq &seq)
```
[44.276024]
[44.276079]
```
static std::string get_userfunction(const keyseq &seq)
```

Replacement in crawl-ref/source/macro.cc at line 113 [34.2457534]

B:BD[44.276118] → [44.276118:276181]

    return (index == -1? NULL : userfunctions[index].c_str());

[44.276118]

[44.276181]

    return (index == -1 ? NULL : userfunctions[index]);

Replacement in crawl-ref/source/initfile.h at line 29 [34.2956146]

B:BD[45.6687] → [46.2982:3098]

∅:D[46.3098] → [47.14666:14717]

B:BD[48.784916] → [47.14666:14717]

int str_to_colour( const std::string &str, int default_colour = -1,
                   bool accept_number = true );
const char* colour_to_str( unsigned char colour );

[45.6687]

[34.2956476]

int str_to_colour(const std::string &str, int default_colour = -1,
                  bool accept_number = true);
const std::string colour_to_str(unsigned char colour);

Replacement in crawl-ref/source/initfile.cc at line 121 [34.2957258]
B:BD[47.14941] → [47.14941:14989]
```
const char* colour_to_str(unsigned char colour)
```
[47.14941]
[47.14989]
```
const std::string colour_to_str(unsigned char colour)
```
Replacement in crawl-ref/source/initfile.cc at line 126 [34.2957258]
B:BD[47.15052] → [47.15052:15089]
```
        return cols[colour].c_str();
```
[47.15052]
[34.2959142]
```
        return cols[colour];
```

Replacement in crawl-ref/source/delay.cc at line 214 [34.3963459]

B:BD[49.2726] → [49.2726:2799]

static const char* _get_recite_speech(const std::string key, int weight)

[49.2726]

[49.2799]

static std::string _get_recite_speech(const std::string key, int weight)

Replacement in crawl-ref/source/delay.cc at line 220 [34.3963459]
B:BD[49.2994] → [49.2994:3024]
```
        return (str.c_str());
```
[49.2994]
[50.3787]
```
        return (str);
```

Replacement in crawl-ref/source/delay.cc at line 432 [34.3963459]

B:BD[49.3114] → [51.4855:4930]

             _get_recite_speech("other", you.num_turns + delay.duration));

[49.3114]

[3.23826]

             _get_recite_speech("other", you.num_turns + delay.duration).c_str());

Replacement in crawl-ref/source/delay.cc at line 686 [34.3963459]

B:BD[51.5044] → [51.5044:5123]

                 _get_recite_speech("start", you.num_turns + delay.duration));

[51.5044]

[3.24066]

                 _get_recite_speech("start", you.num_turns + delay.duration).c_str());

Replacement in crawl-ref/source/delay.cc at line 893 [34.3963459]

B:BD[49.3367] → [51.5124:5205]

                 _get_recite_speech("other", you.num_turns + delay.duration+1));

[49.3367]

[3.24522]

                 _get_recite_speech("other", you.num_turns + delay.duration+1).c_str());

Replacement in crawl-ref/source/delay.cc at line 1037 [34.3963459]

B:BD[49.3489] → [51.5206:5281]

             _get_recite_speech("other", you.num_turns + delay.duration));

[49.3489]

[52.8681]

             _get_recite_speech("other", you.num_turns + delay.duration).c_str());