Updates

Author: inactive123

formats/xml/rxml.c

@@ -66,19 +66,15 @@ static void rxml_free_node(struct rxml_node *node)
 
    for (attrib_node_head = node->attrib; attrib_node_head; )
    {
-      struct rxml_attrib_node *next_attrib = NULL;
-
-      next_attrib = (struct rxml_attrib_node*)attrib_node_head->next;
-
-      if (next_attrib)
-      {
-         if (attrib_node_head->attrib)
-            free(attrib_node_head->attrib);
-         if (attrib_node_head->value)
-            free(attrib_node_head->value);
-         if (attrib_node_head)
-            free(attrib_node_head);
-      }
+      struct rxml_attrib_node *next_attrib =
+            (struct rxml_attrib_node*)attrib_node_head->next;
+
+      if (attrib_node_head->attrib)
+         free(attrib_node_head->attrib);
+      if (attrib_node_head->value)
+         free(attrib_node_head->value);
+      if (attrib_node_head)
+         free(attrib_node_head);
 
       attrib_node_head = next_attrib;
    }
@@ -161,6 +157,7 @@ rxml_document_t *rxml_load_document_string(const char *str)
 
       case YXML_ELEMSTART:
          if (node) {
+
             if (level > stack_i) {
                buf->stack[stack_i] = node;
                ++stack_i;
@@ -177,7 +174,10 @@ rxml_document_t *rxml_load_document_string(const char *str)
             node = doc->root_node = (rxml_node_t*)calloc(1, sizeof(*node));
          }
 
+         if (node->name)
+            free(node->name);
          node->name = strdup(x.elem);
+
          attr = NULL;
 
          ++level;
@@ -188,7 +188,25 @@ rxml_document_t *rxml_load_document_string(const char *str)
 
          if (valptr > buf->val) {
             *valptr = '\0';
-            node->data = strdup(buf->val);
+
+            /* Original code was broken here:
+             * > If an element ended on two successive
+             *   iterations, on the second iteration
+             *   the 'data' for the *previous* node would
+             *   get overwritten
+             * > This effectively erased the data for the
+             *   previous node, *and* caused a memory leak
+             *   (due to the double strdup())
+             * It seems the correct thing to do here is
+             * only copy the data if the current 'level'
+             * and 'stack index' are the same... */
+            if (level == stack_i)
+            {
+               if (node->data)
+                  free(node->data);
+               node->data = strdup(buf->val);
+            }
+
             valptr = buf->val;
          }
 
@@ -211,7 +229,10 @@ rxml_document_t *rxml_load_document_string(const char *str)
          else
             attr = node->attrib = (struct rxml_attrib_node*)calloc(1, sizeof(*attr));
 
+         if (attr->attrib)
+            free(attr->attrib);
          attr->attrib = strdup(x.attr);
+
          valptr = buf->val;
          break;
 
@@ -225,7 +246,11 @@ rxml_document_t *rxml_load_document_string(const char *str)
       case YXML_ATTREND:
          if (valptr > buf->val) {
             *valptr = '\0';
+
+            if (attr->value)
+               free(attr->value);
             attr->value = strdup(buf->val);
+
             valptr = buf->val;
          }
          break;

include/formats/rxml.h

@@ -64,4 +64,6 @@ struct rxml_node *rxml_root_node(rxml_document_t *doc);
 
 const char *rxml_node_attrib(struct rxml_node *node, const char *attrib);
 
+RETRO_END_DECLS
+
 #endif

include/string/stdstring.h

@@ -133,6 +133,10 @@ char* string_tokenize(char **str, const char *delim);
 /* Removes every instance of character 'c' from 'str' */
 void string_remove_all_chars(char *str, char c);
 
+/* Replaces every instance of character 'find' in 'str'
+ * with character 'replace' */
+void string_replace_all_chars(char *str, char find, char replace);
+
 /* Converts string to unsigned integer.
  * Returns 0 if string is invalid  */
 unsigned string_to_unsigned(const char *str);

rthreads/rthreads.c

@@ -268,7 +268,9 @@ int sthread_detach(sthread_t *thread)
    free(thread);
    return 0;
 #else
-   return pthread_detach(thread->id);
+   int ret = pthread_detach(thread->id);
+   free(thread);
+   return ret;
 #endif
 }
 

streams/chd_stream.c

@@ -246,7 +246,7 @@ chdstream_t *chdstream_open(const char *path, int32_t track)
    }
 
    /* Only include pregap data if it was in the track file */
-   if (!strcmp(meta.type, meta.pgtype))
+   if (meta.pgtype[0] != 'V')
       pregap = meta.pregap;
    else
       pregap = 0;

string/stdstring.c

@@ -319,6 +319,19 @@ void string_remove_all_chars(char *str, char c)
    *write_ptr = '\0';
 }
 
+/* Replaces every instance of character 'find' in 'str'
+ * with character 'replace' */
+void string_replace_all_chars(char *str, char find, char replace)
+{
+   char *str_ptr = str;
+
+   if (string_is_empty(str))
+      return;
+
+   while((str_ptr = strchr(str_ptr, find)) != NULL)
+      *str_ptr++ = replace;
+}
+
 /* Converts string to unsigned integer.
  * Returns 0 if string is invalid  */
 unsigned string_to_unsigned(const char *str)

vfs/vfs_implementation_uwp.cpp

@@ -55,62 +55,10 @@ using namespace Windows::Storage::FileProperties;
 #include <string/stdstring.h>
 #include <retro_environment.h>
 #include <uwp/uwp_func.h>
+#include <uwp/uwp_async.h>
 
 namespace
 {
-	/* Dear Microsoft
-	 * I really appreciate all the effort you took to not provide any
-	 * synchronous file APIs and block all attempts to synchronously
-	 * wait for the results of async tasks for "smooth user experience",
-	 * but I'm not going to run and rewrite all RetroArch cores for
-	 * async I/O. I hope you like this hack I made instead.
-	 */
-	template<typename T>
-	T RunAsync(std::function<concurrency::task<T>()> func)
-	{
-		volatile bool finished = false;
-		Platform::Exception^ exception = nullptr;
-		T result;
-
-		func().then([&finished, &exception, &result](concurrency::task<T> t) {
-			try
-			{
-				result = t.get();
-			}
-			catch (Platform::Exception^ exception_)
-			{
-				exception = exception_;
-			}
-			finished = true;
-		});
-
-		/* Don't stall the UI thread - prevents a deadlock */
-		Windows::UI::Core::CoreWindow^ corewindow = Windows::UI::Core::CoreWindow::GetForCurrentThread();
-		while (!finished)
-		{
-			if (corewindow) {
-				corewindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessAllIfPresent);
-			}
-		}
-
-		if (exception != nullptr)
-			throw exception;
-		return result;
-	}
-
-	template<typename T>
-	T RunAsyncAndCatchErrors(std::function<concurrency::task<T>()> func, T valueOnError)
-	{
-		try
-		{
-			return RunAsync<T>(func);
-		}
-		catch (Platform::Exception^ e)
-		{
-			return valueOnError;
-		}
-	}
-
 	void windowsize_path(wchar_t* path)
 	{
 		/* UWP deals with paths containing / instead of \ way worse than normal Windows */