Attachment #101960 for bug #153239

View | Details | Raw Unified | Return to bug 153239
Collapse All | Expand All






    ssize_t c=0;
    int c2=0;
    PyObject *key, *val;
    while (PyDict_Next(obj, &c2, &key, &val)==1)
    {
      c=c2;
      if (!key_type.isMarshallable(key) ||
          !value_type.isMarshallable(val))
        return false;
    }
    if (str) {
      Q_INT32 count = (Q_INT32)PyDict_Size(obj);
      (*str) << count;
      c=0;
      while (PyDict_Next(obj, &c2, &key, &val)==1) {
        c=c2;
        key_type.marshal(key,*str);
        value_type.marshal(val,*str);
      }

Return to bug 153239

Lines 125-141 Link Here

(-)dcoppython-3.5.5.orig/dcoppython/shell/marshaller.cpp (-3 / +7 lines)
125		125
126		126
127	ssize_t c=0;	127	ssize_t c=0;
		128	int c2=0;
128	PyObject key, val;	129	PyObject key, val;
129	while (PyDict_Next(obj, &c, &key, &val)==1)	130	while (PyDict_Next(obj, &c2, &key, &val)==1)
		131	{
		132	c=c2;
130	if (!key_type.isMarshallable(key) \|\|	133	if (!key_type.isMarshallable(key) \|\|
131	!value_type.isMarshallable(val))	134	!value_type.isMarshallable(val))
132	return false;	135	return false;
133		136	}
134	if (str) {	137	if (str) {
135	Q_INT32 count = (Q_INT32)PyDict_Size(obj);	138	Q_INT32 count = (Q_INT32)PyDict_Size(obj);
136	(*str) << count;	139	(*str) << count;
137	c=0;	140	c=0;
138	while (PyDict_Next(obj, &c, &key, &val)==1) {	141	while (PyDict_Next(obj, &c2, &key, &val)==1) {
		142	c=c2;
139	key_type.marshal(key,*str);	143	key_type.marshal(key,*str);
140	value_type.marshal(val,*str);	144	value_type.marshal(val,*str);
141	}	145	}