main-coverity-Geo2G4

Address coverity defect: possible out-of-bounds access. Address minor cppcheck performance defect (return string by const ref)