Merge "trusty: storageproxyd: fix logging of freed path pointer" into main (f426858b) · Commits · e / os / android_system_core

trusty/storage/proxy/storage.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ int storage_file_open(struct storage_msg* msg, const void* r, size_t req_len,
		if (open_flags & O_CREAT) {
		sync_parent(path, watcher);
		}
		free(path);

		/* at this point rc contains storage file fd */
		msg->result = STORAGE_NO_ERROR;
		@@ -361,6 +360,9 @@ int storage_file_open(struct storage_msg* msg, const void* r, size_t req_len,
		ALOGV("%s: \"%s\": fd = %u: handle = %d\n",
		__func__, path, rc, resp.handle);

		free(path);
		path = NULL;

		/* a backing file has been opened, notify any waiting init steps */
		if (!fs_ready_initialized) {
		rc = property_set(FS_READY_PROPERTY, "1");