From 4e48fead44a4cf790b77fdd6709e9597248e7f44 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 28 Jun 2016 13:38:35 +0100
Subject: [PATCH] Repplaced fscanf usage with ifstream to avoid safety issues

---
 src/osgPlugins/logo/ReaderWriterLOGO.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/osgPlugins/logo/ReaderWriterLOGO.cpp b/src/osgPlugins/logo/ReaderWriterLOGO.cpp
index 08c403d7b..8c95a97c0 100644
--- a/src/osgPlugins/logo/ReaderWriterLOGO.cpp
+++ b/src/osgPlugins/logo/ReaderWriterLOGO.cpp
@@ -255,17 +255,14 @@ class LOGOReaderWriter : public osgDB::ReaderWriter
 
             Logos::RelativePosition pos = Logos::LowerRight;
 
-            FILE *fp;
-            if( (fp = osgDB::fopen( fileName.c_str(), "r")) == NULL )
-                return NULL;
-            while( !feof(fp))
+
+            std::ifstream fin(filePath.c_str());
+            if (!fin) return NULL;
+
+            while(fin)
             {
-                char buff[128];
-
-                if( fscanf( fp, "%s", buff ) != 1 )
-                    break;
-
-                std::string str(buff);
+                std::string str;
+                fin >> str;
 
                 if( str == "Center" )
                     pos = Logos::Center;
@@ -284,7 +281,8 @@ class LOGOReaderWriter : public osgDB::ReaderWriter
                 else if( str == "Camera" )
                 {
                     int tn;
-                    if( (fscanf( fp, "%d", &tn )) != 1 )
+                    fin >> tn;
+                    if (fin.fail())
                     {
                         OSG_WARN << "Error... Camera requires an integer argument\n";
                         break;
@@ -316,7 +314,6 @@ class LOGOReaderWriter : public osgDB::ReaderWriter
                     ld->addLogo( pos, str );
                 }
             }
-            fclose( fp );
 
             if( ld->hasLogos() )
                 geode->addDrawable( ld );