Permalink
Browse files

Fix null pointer when decoding invalid DBRef PYTHON-532

  • Loading branch information...
1 parent a9d1457 commit a060c15ef87e0f0e72974c7c0e57fe811bbd06a2 @ajdavis ajdavis committed May 31, 2013
Showing with 35 additions and 3 deletions.
  1. +1 −1 bson/__init__.py
  2. +8 −2 bson/_cbsonmodule.c
  3. +26 −0 test/test_collection.py
View
@@ -150,7 +150,7 @@ def _get_object(data, position, as_class, tz_aware, uuid_subtype):
object = _elements_to_dict(encoded, as_class, tz_aware, uuid_subtype)
position += obj_size
if "$ref" in object:
- return (DBRef(object.pop("$ref"), object.pop("$id"),
+ return (DBRef(object.pop("$ref"), object.pop("$id", None),
object.pop("$db", None), object), position)
return object, position
View
@@ -1202,8 +1202,14 @@ static PyObject* get_value(PyObject* self, const char* buffer, int* position,
Py_INCREF(collection);
PyDict_DelItemString(value, "$ref");
- Py_INCREF(id);
- PyDict_DelItemString(value, "$id");
+
+ if (id == NULL) {
+ id = Py_None;
+ Py_INCREF(id);
+ } else {
+ Py_INCREF(id);
+ PyDict_DelItemString(value, "$id");
+ }
if (database == NULL) {
database = Py_None;
@@ -30,6 +30,7 @@
from bson.binary import Binary, UUIDLegacy, OLD_UUID_SUBTYPE, UUID_SUBTYPE
from bson.code import Code
+from bson.dbref import DBRef
from bson.objectid import ObjectId
from bson.py3compat import b
from bson.son import SON
@@ -1675,6 +1676,31 @@ def test_bad_encode(self):
self.assertRaises(InvalidDocument, c.save, {"x": c})
warnings.simplefilter("default")
+ def test_bad_dbref(self):
+ c = self.db.test
+ c.drop()
+
+ # Incomplete DBRefs.
+ self.assertRaises(
+ InvalidDocument,
+ c.insert, {'ref': {'$ref': 'collection'}})
+
+ self.assertRaises(
+ InvalidDocument,
+ c.insert, {'ref': {'$id': ObjectId()}})
+
+ ref_only = {'ref': {'$ref': 'collection'}}
+ id_only = {'ref': {'$id': ObjectId()}}
+
+ # Force insert of ref without $id.
+ c.insert(ref_only, check_keys=False)
+ self.assertEqual(DBRef('collection', id=None), c.find_one()['ref'])
+ c.drop()
+
+ # DBRef without $ref is decoded as normal subdocument.
+ c.insert(id_only, check_keys=False)
+ self.assertEqual(id_only, c.find_one())
+
def test_as_class(self):
c = self.db.test
c.drop()

0 comments on commit a060c15

Please sign in to comment.