← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mysql-workbench/utopic

« back to all changes in this revision

Viewing changes to ext/scintilla/src/ScintillaBase.cxx

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2014-05-31 12:03:58 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20140531120358-cjik5ofkmj0fxsn8
Tags: 6.1.6+dfsg-1
* New upstream release [May 2014].
* Dropped "prtcl.patch".
* "debian/clean": better clean-up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/scintilla/src/ScintillaBase.cxx
68
68
}
69
69
 
70
70
void ScintillaBase::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
71
 
        bool isFillUp = ac.Active() && ac.IsFillUpChar(*s);
 
71
        bool isFillUp = (s != NULL) && ac.Active() && ac.IsFillUpChar(*s);
72
72
        if (!isFillUp) {
73
73
                Editor::AddCharUTF(s, len, treatAsDBCS);
74
74
        }
75
75
        if (ac.Active()) {
76
 
                AutoCompleteCharacterAdded(s[0]);
 
76
    if (s != NULL) {
 
77
      AutoCompleteCharacterAdded(s[0]);
 
78
    }
77
79
                // For fill ups add the character after the autocompletion has
78
80
                // triggered so containers see the key so can display a calltip.
79
81
                if (isFillUp) {