comparison mercurial/cext/osutil.c @ 45174:f93a4e3d35ab

osutil: fix excessive decref on tuple creation failure in listdir()

The stat object would be freed on error for the same reason as the previous
patch. makestat() can be inlined, but this patch doesn't change it.

https://github.com/python/cpython/blob/2.7/Python/modsupport.c#L292

The __APPLE__ code is untested.

45173:2bc5d1531235

}

static PyObject *_listdir_stat(char *path, int pathlen, int keepstat,
			       char *skip)
{
	PyObject *list, *elem, *stat = NULL, *ret = NULL;
	char fullpath[PATH_MAX + 10];
	int kind, err;
	struct stat st;
	struct dirent *ent;
	DIR *dir;

			ret = PyList_New(0);
			goto error;
		}

		if (keepstat) {
			stat = makestat(&st);
			if (!stat)
				goto error;
			elem = Py_BuildValue(PY23("siN", "yiN"), ent->d_name,
					     kind, stat);
		} else
			elem = Py_BuildValue(PY23("si", "yi"), ent->d_name,
					     kind);
		if (!elem)
			goto error;
		stat = NULL;

		PyList_Append(list, elem);
		Py_DECREF(elem);
	}

	ret = list;
	Py_INCREF(ret);

error:
	Py_DECREF(list);
	Py_XDECREF(stat);
error_list:
	closedir(dir);
	/* closedir also closes its dirfd */
	goto error_value;
error_dir:

#define LISTDIR_BATCH_SIZE 50

static PyObject *_listdir_batch(char *path, int pathlen, int keepstat,
				char *skip, bool *fallback)
{
	PyObject *list, *elem, *stat = NULL, *ret = NULL;
	int kind, err;
	unsigned long index;
	unsigned int count, old_state, new_state;
	bool state_seen = false;
	attrbuf_entry *entry;

				ret = PyList_New(0);
				goto error;
			}

			if (keepstat) {
				/* from the getattrlist(2) man page: "Only the
				   permission bits ... are valid". */
				st.st_mode = (entry->access_mask & ~S_IFMT) | kind;
				st.st_mtime = entry->mtime.tv_sec;
				st.st_size = entry->size;

			} else
				elem = Py_BuildValue(PY23("si", "yi"),
						     filename, kind);
			if (!elem)
				goto error;
			stat = NULL;

			PyList_Append(list, elem);
			Py_DECREF(elem);

			entry = (attrbuf_entry *)((char *)entry + entry->length);

	ret = list;
	Py_INCREF(ret);

error:
	Py_DECREF(list);
	Py_XDECREF(stat);
error_dir:
	close(dfd);
error_value:
	return ret;
}

45174:f93a4e3d35ab

}

static PyObject *_listdir_stat(char *path, int pathlen, int keepstat,
			       char *skip)
{
	PyObject *list, *elem, *ret = NULL;
	char fullpath[PATH_MAX + 10];
	int kind, err;
	struct stat st;
	struct dirent *ent;
	DIR *dir;

			ret = PyList_New(0);
			goto error;
		}

		if (keepstat) {
			PyObject *stat = makestat(&st);
			if (!stat)
				goto error;
			elem = Py_BuildValue(PY23("siN", "yiN"), ent->d_name,
					     kind, stat);
		} else
			elem = Py_BuildValue(PY23("si", "yi"), ent->d_name,
					     kind);
		if (!elem)
			goto error;

		PyList_Append(list, elem);
		Py_DECREF(elem);
	}

	ret = list;
	Py_INCREF(ret);

error:
	Py_DECREF(list);
error_list:
	closedir(dir);
	/* closedir also closes its dirfd */
	goto error_value;
error_dir:

#define LISTDIR_BATCH_SIZE 50

static PyObject *_listdir_batch(char *path, int pathlen, int keepstat,
				char *skip, bool *fallback)
{
	PyObject *list, *elem, *ret = NULL;
	int kind, err;
	unsigned long index;
	unsigned int count, old_state, new_state;
	bool state_seen = false;
	attrbuf_entry *entry;

				ret = PyList_New(0);
				goto error;
			}

			if (keepstat) {
				PyObject *stat = NULL;
				/* from the getattrlist(2) man page: "Only the
				   permission bits ... are valid". */
				st.st_mode = (entry->access_mask & ~S_IFMT) | kind;
				st.st_mtime = entry->mtime.tv_sec;
				st.st_size = entry->size;

			} else
				elem = Py_BuildValue(PY23("si", "yi"),
						     filename, kind);
			if (!elem)
				goto error;

			PyList_Append(list, elem);
			Py_DECREF(elem);

			entry = (attrbuf_entry *)((char *)entry + entry->length);

	ret = list;
	Py_INCREF(ret);

error:
	Py_DECREF(list);
error_dir:
	close(dfd);
error_value:
	return ret;
}