Merge lp:~zorba-coders/zorba/msb-misc into lp:zorba

[Matthias Brantner]

fix crash on mac

[Matthias Brantner (matthias-brantner)]

review: Approve

[Paul J. Lucas (paul-lucas)]

You should use the 2-argument form of get(). What if the whitespace is a tab?

    xquery\t

is perfectly legal.

review: Needs Fixing

[Paul J. Lucas (paul-lucas)]

Approve with objections. Patch does NOT account for leading whitespace or comments.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-25T19-16-44.495Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job msb-misc-2013-03-25T19-16-44.495Z is finished. The final status was:

All tests succeeded!

[lp:~zorba-coders/zorba/msb-misc]

11313. By [u'Matthias Brantner <[e-mail]>'] on 2013-03-25

fix crash on mac Approved: Paul J. Lucas, Matthias Brantner

=== modified file 'src/compiler/api/compiler_api.cpp'
--- src/compiler/api/compiler_api.cpp	2013-03-24 20:40:03 +0000
+++ src/compiler/api/compiler_api.cpp	2013-03-25 17:34:24 +0000
@@ -128,18 +128,19 @@
 ********************************************************************************/
 bool XQueryCompiler::getLanguageMode(std::stringstream& s) const
 {
-  char lPeek[6];
-  s.get(lPeek, 7, ' ');
+  const size_t lPeekSize = 7;
+  char lPeek[lPeekSize];
+  s.get(lPeek, lPeekSize);
   s.clear();
   s.seekg(0, s.beg);
 
   bool lXQueryMode;
 
-  if (strncmp(lPeek, "jsoniq", 6) == 0)
+  if (strncmp(lPeek, "jsoniq", lPeekSize - 1) == 0)
   {
     lXQueryMode = false;
   }
-  else if (strncmp(lPeek, "xquery", 6) == 0)
+  else if (strncmp(lPeek, "xquery", lPeekSize - 1) == 0)
   {
     lXQueryMode = true;
   }