1 files changed, 12 insertions, 0 deletions
diff --git a/jstests/aggregation/bugs/server6232.js b/jstests/aggregation/bugs/server6232.js
new file mode 100644
index 00000000000..63e04acb479
--- /dev/null
+++ b/jstests/aggregation/bugs/server6232.js
@@ -0,0 +1,12 @@
+// SERVER-6232: seg fault when providing an empty object as an expression argument in agg
+// clear and populated db
+db.s6232.drop();
+db.s6232.save({});
+
+// case where an empty object is evaluated
+result = db.s6232.aggregate({$project: {a: {$and: [{}]}}});
+assert.eq(result.result[0].a, true);
+
+// case where result should contain a new empty object
+result = db.s6232.aggregate({$project: {a: {$ifNull: ['$b', {}]}}});
+assert.eq(result.result[0].a, {});