Browse Source

null termination was wiping buffer

marauder2k7 6 months ago
parent
commit
fae5ebb9e8
2 changed files with 9 additions and 11 deletions
  1. 0 1
      Engine/source/console/propertyParsing.h
  2. 9 10
      Engine/source/math/mathTypes.cpp

+ 0 - 1
Engine/source/console/propertyParsing.h

@@ -185,7 +185,6 @@ namespace PropertyInfo
             *ptr++ = ' ';
             *ptr++ = ' ';
       }
       }
 
 
-      *ptr = '\0';
       return ptr; // return end of written string for chaining
       return ptr; // return end of written string for chaining
    }
    }
 
 

+ 9 - 10
Engine/source/math/mathTypes.cpp

@@ -399,12 +399,11 @@ ConsoleGetType( TypeMatrixF )
    static const U32 bufSize = 256;
    static const U32 bufSize = 256;
    char* buffer = Con::getReturnBuffer(bufSize);
    char* buffer = Con::getReturnBuffer(bufSize);
 
 
-   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(col0, buffer, bufSize);
+   PropertyInfo::FormatPropertyBuffer<F32, 3>(col0, buffer, bufSize);
    *buffer++ = ' ';
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(col1, buffer, bufSize);
+   PropertyInfo::FormatPropertyBuffer<F32, 3>(col1, buffer, bufSize);
    *buffer++ = ' ';
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(col2, buffer, bufSize);
-   *buffer = '\0'; // null-terminate just in case
+   PropertyInfo::FormatPropertyBuffer<F32, 3>(col2, buffer, bufSize);
 
 
    return buffer;
    return buffer;
 }
 }
@@ -444,9 +443,9 @@ ConsoleGetType( TypeMatrixPosition )
    Point4F pos(col[0], col[4], col[8], col[12]);
    Point4F pos(col[0], col[4], col[8], col[12]);
 
 
    if (col[12] == 1.0f)
    if (col[12] == 1.0f)
-      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(&pos, returnBuffer, bufSize);
+      PropertyInfo::FormatPropertyBuffer<F32, 3>(&pos, returnBuffer, bufSize);
    else
    else
-      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 4>(&pos, returnBuffer, bufSize);
+      PropertyInfo::FormatPropertyBuffer<F32, 4>(&pos, returnBuffer, bufSize);
 
 
    return returnBuffer;
    return returnBuffer;
 }
 }
@@ -644,9 +643,9 @@ ConsoleGetType( TypeEaseF )
    char* buffer = Con::getReturnBuffer(bufSize);
    char* buffer = Con::getReturnBuffer(bufSize);
 
 
    EaseF* pEase = (EaseF*)dptr;
    EaseF* pEase = (EaseF*)dptr;
-   buffer = PropertyInfo::FormatPropertyBuffer<S32, 2>(pEase + 0, buffer, bufSize);
+   PropertyInfo::FormatPropertyBuffer<S32, 2>(pEase + 0, buffer, bufSize);
    *buffer++ = ' ';
    *buffer++ = ' ';
-   buffer = PropertyInfo::FormatPropertyBuffer<F32, 2>(pEase + 2, buffer, bufSize);
+   PropertyInfo::FormatPropertyBuffer<F32, 2>(pEase + 2, buffer, bufSize);
    *buffer = '\0'; // null-terminate just in case
    *buffer = '\0'; // null-terminate just in case
 
 
    return buffer;
    return buffer;
@@ -691,12 +690,12 @@ ConsoleGetType(TypeRotationF)
    if (pt->mRotationType == RotationF::Euler)
    if (pt->mRotationType == RotationF::Euler)
    {
    {
       EulerF out = pt->asEulerF(RotationF::Degrees);
       EulerF out = pt->asEulerF(RotationF::Degrees);
-      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 3>(out, returnBuffer, bufSize);
+      PropertyInfo::FormatPropertyBuffer<F32, 3>(out, returnBuffer, bufSize);
    }
    }
    else if (pt->mRotationType == RotationF::AxisAngle)
    else if (pt->mRotationType == RotationF::AxisAngle)
    {
    {
       AngAxisF out = pt->asAxisAngle(RotationF::Degrees);
       AngAxisF out = pt->asAxisAngle(RotationF::Degrees);
-      returnBuffer = PropertyInfo::FormatPropertyBuffer<F32, 4>(&out, returnBuffer, bufSize);
+      PropertyInfo::FormatPropertyBuffer<F32, 4>(&out, returnBuffer, bufSize);
    }
    }
    *returnBuffer = '\0'; // null-terminate just in case
    *returnBuffer = '\0'; // null-terminate just in case