1 files changed, 12 insertions, 4 deletions
diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp
index 8a02ec716e3..191a2884aac 100644
--- a/src/shared/Database/Field.cpp
+++ b/src/shared/Database/Field.cpp
@@ -31,8 +31,12 @@ Field::Field(Field &f)
 
     value = f.GetString();
 
-    if (value && (mValue = new char[strlen(value) + 1]))
-        strcpy(mValue, value);
+    if (value)
+    {
+        mValue = new char[strlen(value) + 1];
+        if (mValue)
+            strcpy(mValue, value);
+    }
     else
         mValue = NULL;
 
@@ -42,8 +46,12 @@ Field::Field(Field &f)
 Field::Field(const char *value, enum Field::DataTypes type) :
 mType(type)
 {
-    if (value && (mValue = new char[strlen(value) + 1]))
-        strcpy(mValue, value);
+    if (value)
+    {
+        mValue = new char[strlen(value) + 1];
+        if (mValue)
+            strcpy(mValue, value);
+    }
     else
         mValue = NULL;
 }