SERVER-15210 SERVER-15211 remove OID undefined behavior and make it endian aware

Closes #784

Signed-off-by: Benety Goh <benety@mongodb.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/mongo/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
index e2dad9f071d..5cbfadc434f 100644
--- a/src/mongo/bson/bsonelement.h
+++ b/src/mongo/bson/bsonelement.h
@@ -252,9 +252,7 @@ namespace mongo {
         /** Retrieve the object ID stored in the object.
             You must ensure the element is of type jstOID first. */
         mongo::OID __oid() const {
-            class OID oid;
-            std::memcpy(&oid, value(), sizeof(oid));
-            return oid;
+            return OID::from(value());
         }
 
         /** True if element is null. */
@@ -454,9 +452,7 @@ namespace mongo {
             uassert( 10064 ,  "not a dbref" , type() == DBRef );
             const char * start = value();
             start += 4 + ConstDataView(start).readLE<int>();
-            class OID result;
-            std::memcpy(&result, start, sizeof(result));
-            return result;
+            return mongo::OID::from(start);
         }
 
         /** this does not use fieldName in the comparison, just the value */