diff options
author | Mike Buland <eichlan@xagasoft.com> | 2009-09-09 22:58:01 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2009-09-09 22:58:01 +0000 |
commit | 69924adf356c4377bef02d4a9a331db24701d188 (patch) | |
tree | 75a1b21241e5693f61f760da7d2c815d6ead01f8 | |
parent | 4f6ca21e84eefcca3ad9f88938ecf29c39e24996 (diff) | |
download | libbu++-69924adf356c4377bef02d4a9a331db24701d188.tar.gz libbu++-69924adf356c4377bef02d4a9a331db24701d188.tar.bz2 libbu++-69924adf356c4377bef02d4a9a331db24701d188.tar.xz libbu++-69924adf356c4377bef02d4a9a331db24701d188.zip |
Fixed a minor assignment bug in shared core, assigning an object to itself was
causing memory corruption, and fbasicstring is playing even nicer with shared
core now.
-rw-r--r-- | src/fbasicstring.h | 4 | ||||
-rw-r--r-- | src/sharedcore.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/fbasicstring.h b/src/fbasicstring.h index a654d91..e38e300 100644 --- a/src/fbasicstring.h +++ b/src/fbasicstring.h | |||
@@ -1408,12 +1408,12 @@ namespace Bu | |||
1408 | * Assignment operator. | 1408 | * Assignment operator. |
1409 | *@param rSrc (const MyType &) The FString to set your FString to. | 1409 | *@param rSrc (const MyType &) The FString to set your FString to. |
1410 | */ | 1410 | */ |
1411 | MyType &operator=( const MyType &rSrc ) | 1411 | /* MyType &operator=( const MyType &rSrc ) |
1412 | { | 1412 | { |
1413 | set( rSrc ); | 1413 | set( rSrc ); |
1414 | 1414 | ||
1415 | return (*this); | 1415 | return (*this); |
1416 | } | 1416 | } */ |
1417 | 1417 | ||
1418 | /** | 1418 | /** |
1419 | * Equals comparison operator. | 1419 | * Equals comparison operator. |
diff --git a/src/sharedcore.h b/src/sharedcore.h index 046e973..3dcdc12 100644 --- a/src/sharedcore.h +++ b/src/sharedcore.h | |||
@@ -42,6 +42,9 @@ namespace Bu | |||
42 | 42 | ||
43 | SharedCore &operator=( const SharedCore &rhs ) | 43 | SharedCore &operator=( const SharedCore &rhs ) |
44 | { | 44 | { |
45 | if( core == rhs.core ) | ||
46 | return *this; | ||
47 | |||
45 | _softCopy( rhs ); | 48 | _softCopy( rhs ); |
46 | return *this; | 49 | return *this; |
47 | } | 50 | } |