[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[605] mplayerxp/osdep

[<nic...@us...>]

Revision: 605
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=605&view=rev
Author:   nickols_k
Date:     2012-12-27 09:50:00 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
fix pseudo-random filler

Modified Paths:
--------------
    mplayerxp/osdep/get_path.cpp
    mplayerxp/osdep/mplib.cpp

Modified: mplayerxp/osdep/get_path.cpp
===================================================================
--- mplayerxp/osdep/get_path.cpp	2012-12-27 08:38:19 UTC (rev 604)
+++ mplayerxp/osdep/get_path.cpp	2012-12-27 09:50:00 UTC (rev 605)
@@ -9,11 +9,11 @@
 #include "osdep_msg.h"
 namespace mpxp {
 std::string get_path(const std::string& filename){
-    char *homedir;
+    const char *homedir;
     std::string rs;
     std::string config_dir = std::string("/.")+PROGNAME;
 
-    if ((homedir = ::getenv("HOME")) == NULL) return "";
+    if ((homedir = ::getenv("HOME")) == NULL) throw "No 'HOME' environment found";
     rs=std::string(homedir)+config_dir;
     if (!filename.empty()) rs+="/"+filename;
     mpxp_v<<"get_path('"<<filename<<"') -> "<<rs<<std::endl;

Modified: mplayerxp/osdep/mplib.cpp
===================================================================
--- mplayerxp/osdep/mplib.cpp	2012-12-27 08:38:19 UTC (rev 604)
+++ mplayerxp/osdep/mplib.cpp	2012-12-27 09:50:00 UTC (rev 605)
@@ -35,7 +35,7 @@
     long filler;
     for(i=0;i<psize/sizeof(long);i++) {
 	filler=::rand()&lo_mask;
-	filler=(reinterpret_cast<long>(buffer)&hi_mask)|lo_mask;
+	filler|=(reinterpret_cast<long>(buffer)&hi_mask);
 	((long *)buffer)[i]=::rand()%2?filler:0;
     }
     ::memset(&((char *)buffer)[psize],0,size-psize);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.