Security-55471.14.18.tar.gz

[apple/security.git] / libsecurity_utilities / lib / blob.h

diff --git a/libsecurity_utilities/lib/blob.h b/libsecurity_utilities/lib/blob.h
index ad3adf8de394c750fc0421ce519be871c76aec8f..a3bfb2036979030d5be9a9f283a8712b4b74f53f 100644 (file)
--- a/libsecurity_utilities/lib/blob.h
+++ b/libsecurity_utilities/lib/blob.h
@@ -62,7 +62,7 @@ public:
        size_t length() const { return mLength; }
        
        void initialize(Magic magic, size_t length = 0)
-       { mMagic = magic; mLength = length; }
+       { mMagic = magic; mLength = (uint32_t)length; }
        
        bool validateBlob(Magic magic, size_t minSize = 0, size_t maxSize = 0) const;
 
@@ -87,7 +87,7 @@ public:
 
        void *data()                                            { return this; }
        const void *data() const                        { return this; }
-       void length(size_t size)                        { mLength = size; }
+       void length(size_t size)                        { mLength = (uint32_t)size; }
 
        BlobCore *clone() const
        {
@@ -149,7 +149,7 @@ public:
        { return BlobCore::validateBlob(_magic, sizeof(BlobType)); }
        
        bool validateBlob(size_t extLength) const
-       { return validateBlob() && mLength == extLength; }
+       { return extLength >= sizeof(BlobType) && validateBlob() && mLength == extLength; }
        
        static BlobType *specific(BlobCore *blob, bool unalloc = false)
        {