Changeset 18aace8 in tol

Timestamp:

Oct 18, 2010, 10:59:14 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

42759af

Parents:

52d34ff

Message:

skipping line breaks in base64_decode

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2586 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/txtalgeb.cpp (modified) (2 diffs)

tol/bbasic/txtalgeb.cpp

@@ -1862 +1862 @@
 
 //--------------------------------------------------------------------
-int base64_decode(BArray<unsigned char>& binary, std::string const& encoded_string) 
+int base64_decode(
+  BArray<unsigned char>& binary, 
+  std::string const& encoded_string) 
 //--------------------------------------------------------------------
 {
@@ -1873 +1875 @@
   binary.AllocBuffer(bin_len);
   binary.ReallocBuffer(0);
-
-  while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
-    char_array_4[i++] = encoded_string[in_]; in_++;
+  unsigned char ch;
+  while (in_len-- && ( (ch=encoded_string[in_]) != '='))
+  {
+    if(!is_base64(ch))
+    {
+      if(ch=='\n') { in_++; continue; }
+      else         { break; }
+    }
+    char_array_4[i++] = ch; in_++;
     if (i ==4) {
       for (i = 0; i <4; i++)