summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/sqldbm.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-10 09:48:48 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-10 09:48:48 +0000
commita821a5c34708aff459b31f4d16d2c33ec0ca0ecd (patch)
treefc3a31b7f182b9a2941eb5bd8f342b065fcda090 /crawl-ref/source/sqldbm.cc
parent2ae0f20477620dc731f9d9fc40cc1d8a38069b55 (diff)
downloadcrawl-ref-a821a5c34708aff459b31f4d16d2c33ec0ca0ecd.tar.gz
crawl-ref-a821a5c34708aff459b31f4d16d2c33ec0ca0ecd.zip
A few general fixes:
Fix 1791185: Memory overrun. Patch provided by ennewalker. Fix 1789803. Again, patch by ennewalker. Fix 1790486: Throwing nets and launchers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2063 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/sqldbm.cc')
-rw-r--r--crawl-ref/source/sqldbm.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/sqldbm.cc b/crawl-ref/source/sqldbm.cc
index fee11a9d46..7a6956f08c 100644
--- a/crawl-ref/source/sqldbm.cc
+++ b/crawl-ref/source/sqldbm.cc
@@ -183,7 +183,8 @@ sql_datum::sql_datum(const std::string &s) : dptr(NULL), dsize(s.length()),
{
if ((dptr = new char [dsize]))
{
- strcpy(dptr, s.c_str());
+ if (dsize)
+ memcpy(dptr, s.c_str(), dsize);
need_free = true;
}
}