[SCM] crtmpserver/master: Add patch fixes issue with rvalue access first on some platforms

[jet-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e46e5aeb6c0b68c447743e4568da4738fae44e3c
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Fri May 6 17:30:07 2011 +0300

    Add patch fixes issue with rvalue access first on some platforms

diff --git a/debian/patches/16_fix_rvalue_access.diff b/debian/patches/16_fix_rvalue_access.diff
new file mode 100644
index 0000000..9900a6a
--- /dev/null
+++ b/debian/patches/16_fix_rvalue_access.diff
@@ -0,0 +1,26 @@
+Description: fix rvalue/lvalue issue
+ Fix problem with rvalue is accessed before lvalue
+Author: Andriy Beregovenko <jet at jet.kiev.ua>
+Last-Update: 2011-04-06
+
+--- crtmpserver.orig/crtmpserver/src/crtmpserver.cpp
++++ crtmpserver/crtmpserver/src/crtmpserver.cpp
+@@ -303,10 +303,14 @@
+ void NormalizeCommandLine(string configFile) {
+ 	gRs.commandLine["arguments"]["configFile"] = configFile;
+ 	gRs.commandLine["arguments"].RemoveKey(configFile);
+-	gRs.commandLine["arguments"]["--help"] = (bool)gRs.commandLine["arguments"].HasKey("--help");
+-	gRs.commandLine["arguments"]["--version"] = (bool)gRs.commandLine["arguments"].HasKey("--version");
+-	gRs.commandLine["arguments"]["--use-implicit-console-appender"] = (bool)gRs.commandLine["arguments"].HasKey("--use-implicit-console-appender");
+-	gRs.commandLine["arguments"]["--daemon"] = (bool)gRs.commandLine["arguments"].HasKey("--daemon");
++	bool tmp = (gRs.commandLine["--help"] != V_NULL);
++	gRs.commandLine["--help"] = (bool)tmp;
++	tmp = (gRs.commandLine["--version"] != V_NULL);
++	gRs.commandLine["--version"] = (bool)tmp;
++	tmp = (gRs.commandLine["arguments"]["--use-implicit-console-appender"] != V_NULL);
++	gRs.commandLine["arguments"]["--use-implicit-console-appender"] = (bool)tmp;
++	tmp = (gRs.commandLine["arguments"]["--daemon"] != V_NULL);
++	gRs.commandLine["arguments"]["--daemon"] = (bool)tmp;
+ 	if (gRs.commandLine["arguments"].HasKey("--uid")) {
+ 		gRs.commandLine["arguments"]["--uid"] = (uint32_t) atoi(STR(gRs.commandLine["arguments"]["--uid"]));
+ 	} else {
diff --git a/debian/patches/series b/debian/patches/series
index 895772c..7fbef3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 11_change_log_location.diff
 13_disable_lua_config_install.diff
 15_use_system_lua.diff
+16_fix_rvalue_access.diff

-- 
crtmpserver packaging