Armagetron Advanced

Revision: 8942
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8942&view=rev
Author:   bazaarmagetron
Date:     2009-02-02 13:43:23 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
author: Bazaarmagetron
Automatic merging of commits that would change history order:
   ------------------------------------------------------------
   revno: 828.1.1
   committer: Manuel Moos <z-man@...>
   branch nick: armagetronad
   timestamp: Mon 2009-02-02 13:15:01 +0100
   message:
     Fixed StrPos read-over-end crash. Should have been merged from 0.2.8 already, but was apparently squished.

Modified Paths:
--------------
    armagetronad/trunk/armagetronad/src/tools/tString.cpp

Property Changed:
----------------
    armagetronad/trunk/armagetronad/


Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
   - timestamp: 2009-01-31 19:55:37.661999941 -0500
committer: Daniel Lee Harple <leeharple@...>
properties: 
	branch-nick: armagetronad

   + timestamp: 2009-02-02 14:38:40.822999954 +0100
committer: Bazaarmagetron <z-man@...>
properties: 
	branch-nick: trunk-armagetronad-sync

Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
   - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715
voodoo-20080418152302-ig27bh2y1fbkwp6b
z-man@...
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754
z-man@...
z-man@...
z-man@...
leeharple@...
dave@...
leeharple@...
z-man@...
z-man@...
z-man@...
manuel@...
manuel@...
z-man@...
z-man@...
z-man@...
z-man@...
leeharple@...
z-man@...

   + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715
voodoo-20080418152302-ig27bh2y1fbkwp6b
z-man@...
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754
z-man@...
z-man@...
z-man@...
leeharple@...
dave@...
leeharple@...
z-man@...
z-man@...
z-man@...
manuel@...
manuel@...
z-man@...
z-man@...
z-man@...
z-man@...
leeharple@...
z-man@...
z-man@...

Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
   - 613 z-man@...
626 z-man@...
627 z-man@...
657 z-man@...
678 wrtlprnft@...
679 z-man@...
680 z-man@...
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrtlprnft@...
684 wrtlprnft@...
685 wrtlprnft@...
686 epsy46@...
687 epsy46@...
688 wrtlprnft@...
689 wrtlprnft@...
691 epsy46@...
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 epsy46@...
696 z-man@...
697 wrtlprnft@...
698 wrtlprnft@...
699 dave@...
700 dave@...
701 dave@...
702 dave@...
704 epsy46@...
705 epsy46@...
706 epsy46@...
707 epsy46@...
708 epsy46@...
709 epsy46@...
710 epsy46@...
712 z-man@...
713 dave@...
716 leeharple@...
717 leeharple@...
718 leeharple@...
719 leeharple@...
720 leeharple@...
721 leeharple@...
722 leeharple@...
723 leeharple@...
724 leeharple@...
725 leeharple@...
726 leeharple@...
734 leeharple@...
735 leeharple@...
736 leeharple@...
737 leeharple@...
738 leeharple@...
739 leeharple@...
740 leeharple@...
741 leeharple@...
743 dave@...
744 dave@...
745 leeharple@...
746 dave@...
748 dave@...
749 dave@...
750 dave@...
751 dave@...
752 dave@...
753 dave@...
754 dave@...
755 dave@...
756 dave@...
757 dave@...
758 dave@...
759 dave@...
760 z-man@...
761 z-man@...
762 z-man@...
763 z-man@...
764 z-man@...
770 z-man@...
771 z-man@...
772 z-man@...
774 z-man@...
775 z-man@...
776 z-man@...
777 z-man@...
778 z-man@...
779 leeharple@...
780 leeharple@...
781 leeharple@...
782 leeharple@...
783 leeharple@...
784 leeharple@...
785 z-man@...
787 z-man@...
788 z-man@...
789 z-man@...
794 z-man@...
795 z-man@...
796 z-man@...
797 leeharple@...
798 leeharple@...
799 z-man@...
801 z-man@...
802 z-man@...
805 z-man@...
806 z-man@...
807 z-man@...
808 z-man@...
809 z-man@...
811 z-man@...
812 z-man@...
814 z-man@...
815 z-man@...
816 z-man@...
818 leeharple@...
819 epsy46@...
820 epsy46@...
821 wrtlprnft@...
822 wrtlprnft@...
823 wrtlprnft@...
824 leeharple@...
825 leeharple@...
826 leeharple@...
827 leeharple@...

   + 613 z-man@...
626 z-man@...
627 z-man@...
657 z-man@...
678 wrtlprnft@...
679 z-man@...
680 z-man@...
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrtlprnft@...
684 wrtlprnft@...
685 wrtlprnft@...
686 epsy46@...
687 epsy46@...
688 wrtlprnft@...
689 wrtlprnft@...
691 epsy46@...
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 epsy46@...
696 z-man@...
697 wrtlprnft@...
698 wrtlprnft@...
699 dave@...
700 dave@...
701 dave@...
702 dave@...
704 epsy46@...
705 epsy46@...
706 epsy46@...
707 epsy46@...
708 epsy46@...
709 epsy46@...
710 epsy46@...
712 z-man@...
713 dave@...
716 leeharple@...
717 leeharple@...
718 leeharple@...
719 leeharple@...
720 leeharple@...
721 leeharple@...
722 leeharple@...
723 leeharple@...
724 leeharple@...
725 leeharple@...
726 leeharple@...
734 leeharple@...
735 leeharple@...
736 leeharple@...
737 leeharple@...
738 leeharple@...
739 leeharple@...
740 leeharple@...
741 leeharple@...
743 dave@...
744 dave@...
745 leeharple@...
746 dave@...
748 dave@...
749 dave@...
750 dave@...
751 dave@...
752 dave@...
753 dave@...
754 dave@...
755 dave@...
756 dave@...
757 dave@...
758 dave@...
759 dave@...
760 z-man@...
761 z-man@...
762 z-man@...
763 z-man@...
764 z-man@...
770 z-man@...
771 z-man@...
772 z-man@...
774 z-man@...
775 z-man@...
776 z-man@...
777 z-man@...
778 z-man@...
779 leeharple@...
780 leeharple@...
781 leeharple@...
782 leeharple@...
783 leeharple@...
784 leeharple@...
785 z-man@...
787 z-man@...
788 z-man@...
789 z-man@...
794 z-man@...
795 z-man@...
796 z-man@...
797 leeharple@...
798 leeharple@...
799 z-man@...
801 z-man@...
802 z-man@...
805 z-man@...
806 z-man@...
807 z-man@...
808 z-man@...
809 z-man@...
811 z-man@...
812 z-man@...
814 z-man@...
815 z-man@...
816 z-man@...
818 leeharple@...
819 epsy46@...
820 epsy46@...
821 wrtlprnft@...
822 wrtlprnft@...
823 wrtlprnft@...
824 leeharple@...
825 leeharple@...
826 leeharple@...
827 leeharple@...
830 z-man@...


Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp
===================================================================

--- armagetronad/trunk/armagetronad/src/tools/tString.cpp	2009-02-02 12:36:40 UTC (rev 8941)
+++ armagetronad/trunk/armagetronad/src/tools/tString.cpp	2009-02-02 13:43:23 UTC (rev 8942)
@@ -611,7 +611,7 @@
     for (int i=0; i<Len()-1; i++) {
         if ((*this)(i) == tofind(0)) {
             bool found = true;
-            for (int j=0; j<tofind.Len()-1; j++) {
+            for (int j=0; j<tofind.Len()-1 && i+j < Len()-1; j++) {
                 if ((*this)(i+j) != tofind(j))
                     found = false;
             }


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




Thanks for helping keep SourceForge clean.

Armagetron Advanced

Brought to you by: davidfancella, guru3, z-man

[Armagetronad-commits] SF.net SVN: armagetronad:[8942] armagetronad/trunk/armagetronad