summaryrefslogtreecommitdiff
path: root/src/mongo/bson/bsonobjbuilder.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/bson/bsonobjbuilder.h')
-rw-r--r--src/mongo/bson/bsonobjbuilder.h62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mongo/bson/bsonobjbuilder.h b/src/mongo/bson/bsonobjbuilder.h
index be826d5a824..008ad7953fb 100644
--- a/src/mongo/bson/bsonobjbuilder.h
+++ b/src/mongo/bson/bsonobjbuilder.h
@@ -153,7 +153,7 @@ public:
// do not append eoo, that would corrupt us. the builder auto appends when done() is called.
verify(!e.eoo());
_b.appendNum((char)e.type());
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendBuf((void*)e.value(), e.valuesize());
return static_cast<Derived&>(*this);
}
@@ -161,7 +161,7 @@ public:
/** add a subobject as a member */
Derived& append(StringData fieldName, BSONObj subObj) {
_b.appendNum((char)Object);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendBuf((void*)subObj.objdata(), subObj.objsize());
return static_cast<Derived&>(*this);
}
@@ -176,7 +176,7 @@ public:
verify(size > 4 && size < 100000000);
_b.appendNum((char)Object);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendBuf((void*)objdata, size);
return static_cast<Derived&>(*this);
}
@@ -194,7 +194,7 @@ public:
*/
B& subobjStart(StringData fieldName) {
_b.appendNum((char)Object);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return _b;
}
@@ -203,7 +203,7 @@ public:
*/
Derived& appendArray(StringData fieldName, const BSONObj& subObj) {
_b.appendNum((char)Array);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendBuf((void*)subObj.objdata(), subObj.objsize());
return static_cast<Derived&>(*this);
@@ -216,14 +216,14 @@ public:
the subarray's body */
B& subarrayStart(StringData fieldName) {
_b.appendNum((char)Array);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return _b;
}
/** Append a boolean element */
Derived& appendBool(StringData fieldName, int val) {
_b.appendNum((char)Bool);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((char)(val ? 1 : 0));
return static_cast<Derived&>(*this);
}
@@ -233,7 +233,7 @@ public:
Derived& append(StringData fieldName, const T& n) {
constexpr BSONType type = BSONObjAppendFormat<T>::value;
_b.appendNum(static_cast<char>(type));
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
if constexpr (type == Bool) {
_b.appendNum(static_cast<char>(n));
} else if constexpr (type == NumberInt) {
@@ -284,7 +284,7 @@ public:
*/
Derived& appendOID(StringData fieldName, OID* oid = nullptr, bool generateIfBlank = false) {
_b.appendNum((char)jstOID);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
if (oid)
_b.appendBuf(oid->view().view(), OID::kOIDSize);
else {
@@ -305,7 +305,7 @@ public:
*/
Derived& append(StringData fieldName, OID oid) {
_b.appendNum((char)jstOID);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendBuf(oid.view().view(), OID::kOIDSize);
return static_cast<Derived&>(*this);
}
@@ -324,7 +324,7 @@ public:
*/
Derived& appendTimeT(StringData fieldName, time_t dt) {
_b.appendNum((char)Date);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum(static_cast<unsigned long long>(dt) * 1000);
return static_cast<Derived&>(*this);
}
@@ -343,9 +343,9 @@ public:
*/
Derived& appendRegex(StringData fieldName, StringData regex, StringData options = "") {
_b.appendNum((char)RegEx);
- _b.appendStr(fieldName);
- _b.appendStr(regex);
- _b.appendStr(options);
+ _b.appendCStr(fieldName);
+ _b.appendCStr(regex);
+ _b.appendCStr(options);
return static_cast<Derived&>(*this);
}
@@ -356,9 +356,9 @@ public:
Derived& appendCode(StringData fieldName, StringData code) {
_b.appendNum((char)Code);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)code.size() + 1);
- _b.appendStr(code);
+ _b.appendStrBytesAndNul(code);
return static_cast<Derived&>(*this);
}
@@ -370,7 +370,7 @@ public:
@param sz size includes terminating null character */
Derived& append(StringData fieldName, const char* str, int sz) {
_b.appendNum((char)String);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)sz);
_b.appendBuf(str, sz);
@@ -383,17 +383,17 @@ public:
/** Append a string element */
Derived& append(StringData fieldName, StringData str) {
_b.appendNum((char)String);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)str.size() + 1);
- _b.appendStr(str, true);
+ _b.appendStrBytesAndNul(str);
return static_cast<Derived&>(*this);
}
Derived& appendSymbol(StringData fieldName, StringData symbol) {
_b.appendNum((char)Symbol);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)symbol.size() + 1);
- _b.appendStr(symbol);
+ _b.appendStrBytesAndNul(symbol);
return static_cast<Derived&>(*this);
}
@@ -404,7 +404,7 @@ public:
/** Append a Null element to the object */
Derived& appendNull(StringData fieldName) {
_b.appendNum((char)jstNULL);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return static_cast<Derived&>(*this);
}
@@ -412,13 +412,13 @@ public:
// Append an element that is less than all other keys.
Derived& appendMinKey(StringData fieldName) {
_b.appendNum((char)MinKey);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return static_cast<Derived&>(*this);
}
// Append an element that is greater than all other keys.
Derived& appendMaxKey(StringData fieldName) {
_b.appendNum((char)MaxKey);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return static_cast<Derived&>(*this);
}
@@ -439,9 +439,9 @@ public:
*/
Derived& appendDBRef(StringData fieldName, StringData ns, const OID& oid) {
_b.appendNum((char)DBRef);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)ns.size() + 1);
- _b.appendStr(ns);
+ _b.appendStrBytesAndNul(ns);
_b.appendBuf(oid.view().view(), OID::kOIDSize);
return static_cast<Derived&>(*this);
@@ -460,7 +460,7 @@ public:
*/
Derived& appendBinData(StringData fieldName, int len, BinDataType type, const void* data) {
_b.appendNum((char)BinData);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum(len);
_b.appendNum((char)type);
_b.appendBuf(data, len);
@@ -480,7 +480,7 @@ public:
*/
Derived& appendBinDataArrayDeprecated(const char* fieldName, const void* data, int len) {
_b.appendNum((char)BinData);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum(len + 4);
_b.appendNum((char)0x2);
_b.appendNum(len);
@@ -494,10 +494,10 @@ public:
*/
Derived& appendCodeWScope(StringData fieldName, StringData code, const BSONObj& scope) {
_b.appendNum((char)CodeWScope);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
_b.appendNum((int)(4 + 4 + code.size() + 1 + scope.objsize()));
_b.appendNum((int)code.size() + 1);
- _b.appendStr(code);
+ _b.appendStrBytesAndNul(code);
_b.appendBuf((void*)scope.objdata(), scope.objsize());
return static_cast<Derived&>(*this);
@@ -509,7 +509,7 @@ public:
Derived& appendUndefined(StringData fieldName) {
_b.appendNum((char)Undefined);
- _b.appendStr(fieldName);
+ _b.appendCStr(fieldName);
return static_cast<Derived&>(*this);
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-09-11 13:37:28 +0000